From fedora-extras-commits at redhat.com Wed Feb 1 00:00:36 2006 From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy)) Date: Tue, 31 Jan 2006 19:00:36 -0500 Subject: rpms/sblim-cmpi-base/FC-4 sblim-cmpi-base.spec,1.1,1.2 Message-ID: <200602010001.k11019ZF030731@cvs-int.fedora.redhat.com> Author: hamzy Update of /cvs/extras/rpms/sblim-cmpi-base/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28998 Modified Files: sblim-cmpi-base.spec Log Message: Changing release to 3.fc4 Index: sblim-cmpi-base.spec =================================================================== RCS file: /cvs/extras/rpms/sblim-cmpi-base/FC-4/sblim-cmpi-base.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sblim-cmpi-base.spec 31 Jan 2006 21:20:04 -0000 1.1 +++ sblim-cmpi-base.spec 1 Feb 2006 00:00:36 -0000 1.2 @@ -12,7 +12,7 @@ Summary: SBLIM Base Providers Name: sblim-cmpi-base Version: 1.5.4 -Release: 3 +Release: 3.fc4 Group: Systems Management/Base URL: http://www.sblim.org License: CPL From fedora-extras-commits at redhat.com Wed Feb 1 01:12:19 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 20:12:19 -0500 Subject: rpms/fftw2 - New directory Message-ID: <200602010112.k111CL8T000371@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv363/fftw2 Log Message: Directory /cvs/extras/rpms/fftw2 added to the repository From fedora-extras-commits at redhat.com Wed Feb 1 01:12:26 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 20:12:26 -0500 Subject: rpms/fftw2/devel - New directory Message-ID: <200602010112.k111CSEt000386@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv363/fftw2/devel Log Message: Directory /cvs/extras/rpms/fftw2/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 1 01:13:24 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 20:13:24 -0500 Subject: rpms/fftw2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602010113.k111DQpf000438@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv408/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fftw2 --- NEW 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 Feb 1 01:13:02 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 20:13:02 -0500 Subject: rpms/fftw2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602010113.k111DNpW000421@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv408 Added Files: Makefile import.log Log Message: Setup of module fftw2 --- NEW FILE Makefile --- # Top level Makefile for module fftw2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 1 01:15:20 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 20:15:20 -0500 Subject: rpms/fftw2 import.log,1.1,1.2 Message-ID: <200602010115.k111FrS8000513@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv479 Modified Files: import.log Log Message: auto-import fftw2-2.1.5-9 on branch devel from fftw2-2.1.5-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fftw2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Feb 2006 01:13:02 -0000 1.1 +++ import.log 1 Feb 2006 01:15:20 -0000 1.2 @@ -0,0 +1 @@ +fftw2-2_1_5-9:HEAD:fftw2-2.1.5-9.src.rpm:1138756496 From fedora-extras-commits at redhat.com Wed Feb 1 01:15:26 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 20:15:26 -0500 Subject: rpms/fftw2/devel fftw2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602010115.k111Fxl8000517@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv479/devel Modified Files: .cvsignore sources Added Files: fftw2.spec Log Message: auto-import fftw2-2.1.5-9 on branch devel from fftw2-2.1.5-9.src.rpm --- NEW FILE fftw2.spec --- Name: fftw2 Version: 2.1.5 Release: 9 Summary: Fast Fourier Transform library %define real_name fftw Group: System Environment/Libraries License: GPL URL: http://www.fftw.org/ Source0: ftp://ftp.fftw.org/pub/fftw/fftw-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran %description FFTW is a C subroutine library for computing the Discrete Fourier Transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. We believe that FFTW, which is free software, should become the FFT library of choice for most applications. Our benchmarks, performed on on a variety of platforms, show that FFTW's performance is typically superior to that of other publicly available FFT software. %package devel Summary: Headers, libraries and docs for the FFTW library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel FFTW is a C subroutine library for computing the Discrete Fourier Transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. We believe that FFTW, which is free software, should become the FFT library of choice for most applications. Our benchmarks, performed on on a variety of platforms, show that FFTW's performance is typically superior to that of other publicly available FFT software. This package contains header files and development libraries needed to develop programs using the FFTW fast Fourier transform library. %prep %setup -q -c %{real_name}-%{version} mv %{name}-%{version} single cp -a single double %build pushd double %ifarch i386 %configure \ --enable-shared \ --enable-threads \ --enable-i386-hacks %else %configure \ --enable-shared \ --enable-threads %endif make %{?_smp_mflags} popd pushd single %configure \ --enable-shared \ --enable-type-prefix \ --enable-threads \ --enable-float make %{?_smp_mflags} popd %install rm -rf ${RPM_BUILD_ROOT} pushd double make install DESTDIR=${RPM_BUILD_ROOT} cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO ../ cp -a FAQ/fftw-faq.html/ doc/ ../ popd pushd single make install DESTDIR=${RPM_BUILD_ROOT} popd rm -f doc/Makefile* find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf ${RPM_BUILD_ROOT} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/ %{_includedir}/* %{_libdir}/*.a %{_libdir}/*.so %{_infodir}/* %changelog * Wed Feb 1 2006 Jos?? Matos - 2.1.5-9 - Rename package to fftw2. * Mon May 23 2005 Michael Schwendt - 2.1.5-8 - BuildReq gcc-gfortran (#156490). * Sun May 22 2005 Jeremy Katz - 2.1.5-7 - rebuild on all arches - buildrequire compat-gcc-32-g77 * Fri Apr 7 2005 Michael Schwendt - rebuilt * Wed Nov 10 2004 Matthias Saou 2.1.5-5 - Bump release to provide Extras upgrade path. * Tue Apr 06 2004 Phillip Compton - 0:2.1.5-0.fdr.4 - BuildReq gcc-g77. * Mon Sep 22 2003 Phillip Compton - 0:2.1.5-0.fdr.3 - Dropped post/preun scripts for info. * Wed Sep 17 2003 Phillip Compton - 0:2.1.5-0.fdr.2 - Remove aesthetic comments. - buildroot -> RPM_BUILD_ROOT. - post/preun for info files. * Mon Apr 07 2003 Phillip Compton - 0:2.1.5-0.fdr.1 - Updated to 2.1.5. * Tue Apr 01 2003 Phillip Compton - 0:2.1.4-0.fdr.2 - Added Epoch:0. - Added ldconfig to post and postun. * Sun Mar 22 2003 Phillip Compton - 2.1.4-0.fdr.1 - Updated to 2.1.4. * Fri Mar 14 2003 Phillip Compton - 2.1.3-0.fdr.1 - Fedorafied. * Mon Oct 21 2002 Matthias Saou - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fftw2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Feb 2006 01:13:24 -0000 1.1 +++ .cvsignore 1 Feb 2006 01:15:26 -0000 1.2 @@ -0,0 +1 @@ +fftw-2.1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fftw2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Feb 2006 01:13:24 -0000 1.1 +++ sources 1 Feb 2006 01:15:26 -0000 1.2 @@ -0,0 +1 @@ +8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 01:41:15 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 20:41:15 -0500 Subject: owners owners.list,1.589,1.590 Message-ID: <200602010141.k111flKf000796@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv777 Modified Files: owners.list Log Message: take ownership of fftw version 2.x Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.589 retrieving revision 1.590 diff -u -r1.589 -r1.590 --- owners.list 31 Jan 2006 21:29:39 -0000 1.589 +++ owners.list 1 Feb 2006 01:41:14 -0000 1.590 @@ -210,8 +210,8 @@ Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| +Fedora Extras|fftw2|Fast Fourier Transform library|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| -Fedora Extras|fftw|Fast Fourier Transform library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Feb 1 02:01:36 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 21:01:36 -0500 Subject: rpms/fftw2/FC-4 fftw2.spec,1.1,1.2 Message-ID: <200602010202.k11228rZ002668@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2637 Modified Files: fftw2.spec Log Message: Add disttag to release. Index: fftw2.spec =================================================================== RCS file: /cvs/extras/rpms/fftw2/FC-4/fftw2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fftw2.spec 1 Feb 2006 01:15:26 -0000 1.1 +++ fftw2.spec 1 Feb 2006 02:01:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: fftw2 Version: 2.1.5 -Release: 9 +Release: 10%{?dist} Summary: Fast Fourier Transform library %define real_name fftw @@ -115,6 +115,9 @@ %changelog +* Wed Feb 1 2006 Jos?? Matos - 2.1.5-10 +- Add disttag to release. + * Wed Feb 1 2006 Jos?? Matos - 2.1.5-9 - Rename package to fftw2. From fedora-extras-commits at redhat.com Wed Feb 1 02:02:59 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 21:02:59 -0500 Subject: rpms/fftw2/devel fftw2.spec,1.1,1.2 Message-ID: <200602010203.k1123mM9002712@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2689 Modified Files: fftw2.spec Log Message: Add disttag to release. Index: fftw2.spec =================================================================== RCS file: /cvs/extras/rpms/fftw2/devel/fftw2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fftw2.spec 1 Feb 2006 01:15:26 -0000 1.1 +++ fftw2.spec 1 Feb 2006 02:02:59 -0000 1.2 @@ -1,6 +1,6 @@ Name: fftw2 Version: 2.1.5 -Release: 9 +Release: 10%{?dist} Summary: Fast Fourier Transform library %define real_name fftw @@ -115,6 +115,9 @@ %changelog +* Wed Feb 1 2006 Jos?? Matos - 2.1.5-10 +- Add disttag to release. + * Wed Feb 1 2006 Jos?? Matos - 2.1.5-9 - Rename package to fftw2. From fedora-extras-commits at redhat.com Wed Feb 1 02:13:59 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 21:13:59 -0500 Subject: rpms/grace/devel grace.spec, 1.2, 1.3 grace.csh, 1.1, NONE grace.sh, 1.1, NONE Message-ID: <200602010214.k112EW1n002863@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/grace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2846 Modified Files: grace.spec Removed Files: grace.csh grace.sh Log Message: * Wed Feb 1 2006 Jos?? Matos - 5.1.19-2 - Update BR from fftw to fftw2. - Remove references to previous profile scripts. Index: grace.spec =================================================================== RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- grace.spec 13 Jan 2006 17:26:12 -0000 1.2 +++ grace.spec 1 Feb 2006 02:13:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: grace Version: 5.1.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Numerical Data Processing and Visualization Tool License: GPL @@ -9,16 +9,14 @@ Source0: ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png -#Source3: %{name}.sh -#Source4: %{name}.csh -Source5: cephes-license.email -Source6: LICENSE.cephes +Source3: cephes-license.email +Source4: LICENSE.cephes Patch: %{name}-gracerc-no_auxiliary.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: Applications/Engineering BuildRequires: libjpeg-devel, libpng-devel, netcdf-devel -BuildRequires: zlib-devel, libXpm-devel, fftw-devel, t1lib-devel +BuildRequires: zlib-devel, libXpm-devel, fftw2-devel, t1lib-devel BuildRequires: openmotif-devel, gcc-gfortran BuildRequires: desktop-file-utils, font-utils Requires: nedit @@ -49,7 +47,7 @@ %patch %build -cp %{SOURCE5} %{SOURCE6} . +cp %{SOURCE3} %{SOURCE4} . %configure \ --enable-editres \ --with-editor=nedit \ @@ -119,11 +117,6 @@ --add-category Application \ --add-category Graphics \ %{buildroot}%{_datadir}/applications/%{name}.desktop -## -# Profile scripts -# -#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh -#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh %clean @@ -143,7 +136,6 @@ %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae %doc cephes-license.email LICENSE.cephes %doc examples/ doc/ -#%{_sysconfdir}/profile.d/* %config(noreplace) %{_sysconfdir}/%{name}/ %{_bindir}/* %{_datadir}/%{name} @@ -164,7 +156,11 @@ %changelog -* Fri Jan 13 2006 Jose' Matos - 5.1.19-1 +* Wed Feb 1 2006 Jos?? Matos - 5.1.19-2 +- Update BR from fftw to fftw2. +- Remove references to previous profile scripts. + +* Fri Jan 13 2006 Jos?? Matos - 5.1.19-1 - new upstream version - remove name from Summary - disable setting environment variable GRACE_HOME --- grace.csh DELETED --- --- grace.sh DELETED --- From fedora-extras-commits at redhat.com Wed Feb 1 02:17:48 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 31 Jan 2006 21:17:48 -0500 Subject: rpms/diction/devel diction.spec,1.1,1.2 Message-ID: <200602010218.k112ILus002900@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2883 Modified Files: diction.spec Log Message: Rebuild for FC5 Index: diction.spec =================================================================== RCS file: /cvs/extras/rpms/diction/devel/diction.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- diction.spec 1 Jul 2005 15:02:16 -0000 1.1 +++ diction.spec 1 Feb 2006 02:17:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: diction Version: 1.08 -Release: 1%{?dist} +Release: 1.1%{?dist} Summary: Identifies diction and style errors Group: Applications/Text @@ -49,6 +49,9 @@ %changelog +* Tue Jan 31 2006 Konstantin Ryabitsev - 1.08-1.1 +- FC5 rebuild + * Thu Jun 30 2005 Konstantin Ryabitsev - 1.08-1 - Version 1.08 - Do not list locale files namely in addition to findlang From fedora-extras-commits at redhat.com Wed Feb 1 02:19:41 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 21:19:41 -0500 Subject: rpms/fftw2/devel fftw2.spec,1.2,1.3 Message-ID: <200602010220.k112KDGf002963@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2946 Modified Files: fftw2.spec Log Message: * Wed Feb 1 2006 Jose' Matos - 2.1.5-11 - Fix incomplete substitution Index: fftw2.spec =================================================================== RCS file: /cvs/extras/rpms/fftw2/devel/fftw2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fftw2.spec 1 Feb 2006 02:02:59 -0000 1.2 +++ fftw2.spec 1 Feb 2006 02:19:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: fftw2 Version: 2.1.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Fast Fourier Transform library %define real_name fftw @@ -41,7 +41,7 @@ %prep %setup -q -c %{real_name}-%{version} -mv %{name}-%{version} single +mv %{real_name}-%{version} single cp -a single double @@ -115,6 +115,9 @@ %changelog +* Wed Feb 1 2006 Jose' Matos - 2.1.5-11 +- Fix incomplete substitution + * Wed Feb 1 2006 Jos?? Matos - 2.1.5-10 - Add disttag to release. From fedora-extras-commits at redhat.com Wed Feb 1 02:20:42 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 31 Jan 2006 21:20:42 -0500 Subject: rpms/qscintilla/devel qscintilla.spec,1.1,1.2 Message-ID: <200602010221.k112LFcn003024@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2969 Modified Files: qscintilla.spec Log Message: Rebuild for FC5. Index: qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/qscintilla/devel/qscintilla.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qscintilla.spec 15 Sep 2005 15:10:44 -0000 1.1 +++ qscintilla.spec 1 Feb 2006 02:20:42 -0000 1.2 @@ -3,7 +3,7 @@ Name: qscintilla Version: 1.6 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: A Scintilla port to Qt License: GPL @@ -105,6 +105,9 @@ %changelog +* Tue Jan 31 2006 Konstantin Ryabitsev - 1.6-3.1 +- Rebuild for FC5. + * Wed Sep 14 2005 Konstantin Ryabitsev - 1.6-3 - Fix permissions in prep, not in install. From fedora-extras-commits at redhat.com Wed Feb 1 02:21:58 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 21:21:58 -0500 Subject: rpms/fftw2/FC-4 fftw2.spec,1.2,1.3 Message-ID: <200602010222.k112MVwA003093@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/fftw2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3076 Modified Files: fftw2.spec Log Message: * Wed Feb 1 2006 Jose' Matos - 2.1.5-11 - Fix incomplete substitution Index: fftw2.spec =================================================================== RCS file: /cvs/extras/rpms/fftw2/FC-4/fftw2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fftw2.spec 1 Feb 2006 02:01:35 -0000 1.2 +++ fftw2.spec 1 Feb 2006 02:21:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: fftw2 Version: 2.1.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Fast Fourier Transform library %define real_name fftw @@ -41,7 +41,7 @@ %prep %setup -q -c %{real_name}-%{version} -mv %{name}-%{version} single +mv %{real_name}-%{version} single cp -a single double @@ -115,6 +115,9 @@ %changelog +* Wed Feb 1 2006 Jose' Matos - 2.1.5-11 +- Fix incomplete substitution + * Wed Feb 1 2006 Jos?? Matos - 2.1.5-10 - Add disttag to release. From fedora-extras-commits at redhat.com Wed Feb 1 02:30:17 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 21:30:17 -0500 Subject: rpms/grace/FC-4 grace.spec, 1.2, 1.3 grace.csh, 1.1, NONE grace.sh, 1.1, NONE Message-ID: <200602010230.k112UohS003269@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/grace/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3245 Modified Files: grace.spec Removed Files: grace.csh grace.sh Log Message: * Wed Feb 1 2006 Jos?? Matos - 5.1.19-2 - Update BR from fftw to fftw2. - Remove references to previous profile scripts. Index: grace.spec =================================================================== RCS file: /cvs/extras/rpms/grace/FC-4/grace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- grace.spec 12 Jan 2006 12:38:15 -0000 1.2 +++ grace.spec 1 Feb 2006 02:30:17 -0000 1.3 @@ -1,24 +1,22 @@ Name: grace Version: 5.1.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Numerical Data Processing and Visualization Tool License: GPL -# Xbae is BSD and cephes is LGPL, see also Source5 and Source6 +# Xbae is BSD and cephes is LGPL, see also Source3 and Source4 URL: http://plasma-gate.weizmann.ac.il/Grace/ Source0: ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png -#Source3: %{name}.sh -#Source4: %{name}.csh -Source5: cephes-license.email -Source6: LICENSE.cephes +Source3: cephes-license.email +Source4: LICENSE.cephes Patch: %{name}-gracerc-no_auxiliary.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: Applications/Engineering BuildRequires: libjpeg-devel, libpng-devel, netcdf-devel -BuildRequires: zlib-devel, xorg-x11-devel, fftw-devel, t1lib-devel +BuildRequires: zlib-devel, xorg-x11-devel, fftw2-devel, t1lib-devel BuildRequires: openmotif-devel, gcc-gfortran BuildRequires: desktop-file-utils, font-utils Requires: nedit @@ -49,7 +47,7 @@ %patch %build -cp %{SOURCE5} %{SOURCE6} . +cp %{SOURCE3} %{SOURCE4} . %configure \ --enable-editres \ --with-editor=nedit \ @@ -79,7 +77,6 @@ %{buildroot}%{_datadir}/applications \ %{buildroot}%{_mandir}/man1 \ %{buildroot}%{_sysconfdir}/%{name} -# %{buildroot}%{_sysconfdir}/profile.d \ ## # Let's have some sanity @@ -119,11 +116,6 @@ --add-category Application \ --add-category Graphics \ %{buildroot}%{_datadir}/applications/%{name}.desktop -## -# Profile scripts -# -#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh -#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh %clean @@ -143,7 +135,6 @@ %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae %doc cephes-license.email LICENSE.cephes %doc examples/ doc/ -#%{_sysconfdir}/profile.d/* %config(noreplace) %{_sysconfdir}/%{name}/ %{_bindir}/* %{_datadir}/%{name} @@ -164,7 +155,11 @@ %changelog -* Thu Jan 12 2006 Jose' Matos - 5.1.19-1 +* Wed Feb 1 2006 Jos?? Matos - 5.1.19-2 +- Update BR from fftw to fftw2. +- Remove references to previous profile scripts. + +* Thu Jan 12 2006 Jos?? Matos - 5.1.19-1 - new upstream version - remove name from Summary - disable setting environment variable GRACE_HOME --- grace.csh DELETED --- --- grace.sh DELETED --- From fedora-extras-commits at redhat.com Wed Feb 1 02:38:08 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 21:38:08 -0500 Subject: rpms/grace/FC-3 grace.spec, 1.3, 1.4 grace.csh, 1.1, NONE grace.sh, 1.1, NONE Message-ID: <200602010238.k112cfGF003319@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/grace/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3302 Modified Files: grace.spec Removed Files: grace.csh grace.sh Log Message: * Wed Feb 1 2006 Jos?? Matos - 5.1.19-2 - Update BR from fftw to fftw2. - Remove references to previous profile scripts. Index: grace.spec =================================================================== RCS file: /cvs/extras/rpms/grace/FC-3/grace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- grace.spec 12 Jan 2006 12:30:59 -0000 1.3 +++ grace.spec 1 Feb 2006 02:38:08 -0000 1.4 @@ -1,24 +1,22 @@ Name: grace Version: 5.1.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Numerical Data Processing and Visualization Tool License: GPL -# Xbae is BSD and cephes is LGPL, see also Source5 and Source6 +# Xbae is BSD and cephes is LGPL, see also Source3 and Source4 URL: http://plasma-gate.weizmann.ac.il/Grace/ Source0: ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png -#Source3: %{name}.sh -#Source4: %{name}.csh -Source5: cephes-license.email -Source6: LICENSE.cephes +Source3: cephes-license.email +Source4: LICENSE.cephes Patch: %{name}-gracerc-no_auxiliary.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: Applications/Engineering BuildRequires: libjpeg-devel, libpng-devel, netcdf-devel -BuildRequires: zlib-devel, xorg-x11-devel, fftw-devel, t1lib-devel +BuildRequires: zlib-devel, xorg-x11-devel, fftw2-devel, t1lib-devel BuildRequires: openmotif-devel, gcc-g77 BuildRequires: desktop-file-utils, font-utils Requires: nedit @@ -49,7 +47,7 @@ %patch %build -cp %{SOURCE5} %{SOURCE6} . +cp %{SOURCE3} %{SOURCE4} . %configure \ --enable-editres \ --with-editor=nedit \ @@ -78,7 +76,6 @@ %{buildroot}%{_datadir}/applications \ %{buildroot}%{_mandir}/man1 \ %{buildroot}%{_sysconfdir}/%{name} -# %{buildroot}%{_sysconfdir}/profile.d \ ## # Let's have some sanity @@ -118,11 +115,6 @@ --add-category Application \ --add-category Graphics \ %{buildroot}%{_datadir}/applications/%{name}.desktop -## -# Profile scripts -# -#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh -#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh %clean @@ -142,7 +134,6 @@ %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae %doc cephes-license.email LICENSE.cephes %doc examples/ doc/ -#%{_sysconfdir}/profile.d/* %config(noreplace) %{_sysconfdir}/%{name}/ %{_bindir}/* %{_datadir}/%{name} @@ -163,10 +154,14 @@ %changelog -* Thu Jan 12 2006 Jose' Matos - 5.1.19-1 +* Wed Feb 1 2006 Jos?? Matos - 5.1.19-2 +- Update BR from fftw to fftw2. +- Remove references to previous profile scripts. + +* Thu Jan 12 2006 Jos?? Matos - 5.1.19-1 - new upstream version -* Thu Jan 12 2006 Jose' Matos - 5.1.18-8 +* Thu Jan 12 2006 Jos?? Matos - 5.1.18-8 - remove name from Summary - disable setting environment variable GRACE_HOME - use g77 as the fortran compiler --- grace.csh DELETED --- --- grace.sh DELETED --- From fedora-extras-commits at redhat.com Wed Feb 1 02:53:03 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Tue, 31 Jan 2006 21:53:03 -0500 Subject: rpms/grace/devel grace.spec,1.3,1.4 Message-ID: <200602010253.k112rZD8003477@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/grace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3460 Modified Files: grace.spec Log Message: Synchronize with other branches Index: grace.spec =================================================================== RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- grace.spec 1 Feb 2006 02:13:59 -0000 1.3 +++ grace.spec 1 Feb 2006 02:53:03 -0000 1.4 @@ -4,7 +4,7 @@ Summary: Numerical Data Processing and Visualization Tool License: GPL -# Xbae is BSD and cephes is LGPL, see also Source5 and Source6 +# Xbae is BSD and cephes is LGPL, see also Source3 and Source4 URL: http://plasma-gate.weizmann.ac.il/Grace/ Source0: ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -77,7 +77,6 @@ %{buildroot}%{_datadir}/applications \ %{buildroot}%{_mandir}/man1 \ %{buildroot}%{_sysconfdir}/%{name} -# %{buildroot}%{_sysconfdir}/profile.d \ ## # Let's have some sanity From fedora-extras-commits at redhat.com Wed Feb 1 03:18:18 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 31 Jan 2006 22:18:18 -0500 Subject: rpms/xfce4-iconbox/devel xfce4-iconbox.spec,1.6,1.7 Message-ID: <200602010318.k113Io9e005366@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-iconbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5339 Modified Files: xfce4-iconbox.spec Log Message: Added imake and libXt-devel to BuildRequires for modular xorg Index: xfce4-iconbox.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-iconbox/devel/xfce4-iconbox.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce4-iconbox.spec 12 Nov 2005 16:52:44 -0000 1.6 +++ xfce4-iconbox.spec 1 Feb 2006 03:18:16 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Icon box for the Xfce4 Desktop Environment Name: xfce4-iconbox Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-iconbox-4.2.3.tar.gz @@ -14,6 +14,8 @@ BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: libxfce4mcs-devel >= %{version} BuildRequires: xfce-mcs-manager-devel >= %{version} +BuildRequires: imake +BuildRequires: libXt-devel %description xfce-iconbox shows icons for running programs. @@ -46,6 +48,9 @@ %{_datadir}/icons/hicolor/*/*/* %changelog +* Tue Jan 31 2006 Kevin Fenzi - 4.2.3-2.fc5 +- Added imake and libXt-devel to BuildRequires for modular xorg + * Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 - Update to 4.2.3 - Added dist tag From fedora-extras-commits at redhat.com Wed Feb 1 03:31:01 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 31 Jan 2006 22:31:01 -0500 Subject: rpms/xfce4-panel/devel xfce4-panel.spec,1.6,1.7 Message-ID: <200602010331.k113VXfQ005461@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444 Modified Files: xfce4-panel.spec Log Message: added imake and libXt-devel BuildRequires for modular xorg Index: xfce4-panel.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce4-panel.spec 12 Nov 2005 16:35:32 -0000 1.6 +++ xfce4-panel.spec 1 Feb 2006 03:31:01 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Next generation panel for Xfce Name: xfce4-panel Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-panel-4.2.3.tar.gz @@ -19,6 +19,8 @@ BuildRequires: xfce-mcs-manager-devel >= %{version} BuildRequires: libxml2-devel >= 2.4.0 BuildRequires: startup-notification-devel +BuildRequires: imake +BuildRequires: libXt-devel %description This package includes the panel for the Xfce desktop environment @@ -68,6 +70,9 @@ %{_includedir}/xfce4 %changelog +* Tue Jan 31 2006 Kevin Fenzi - 4.2.3-2.fc5 +- added imake and libXt-devel BuildRequires for modular xorg + * Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 - Update to 4.2.3 - Added dist tag From fedora-extras-commits at redhat.com Wed Feb 1 03:57:59 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 31 Jan 2006 22:57:59 -0500 Subject: rpms/xfce4-session/devel xfce4-session.spec,1.7,1.8 Message-ID: <200602010358.k113wV56005565@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5548 Modified Files: xfce4-session.spec Log Message: Added xorg-x11-server-utils, imake, libXt-devel BuildRequires Added xorg-x11-server-utils to Requires Index: xfce4-session.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xfce4-session.spec 12 Nov 2005 17:45:02 -0000 1.7 +++ xfce4-session.spec 1 Feb 2006 03:57:59 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Xfce session manager Name: xfce4-session Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-session-4.2.3.tar.gz @@ -10,12 +10,15 @@ Requires: libxfcegui4 >= 4.2.3 Requires: libxfce4mcs >= 4.2.3 Requires: xfce-mcs-manager >= 4.2.3 +Requires: xorg-x11-server-utils BuildRequires: libxfcegui4-devel >= 4.2.3 BuildRequires: libxfce4mcs-devel >= 4.2.3 BuildRequires: xfce-mcs-manager-devel >= 4.2.3 BuildRequires: startup-notification-devel BuildRequires: gettext -BuildRequires: xorg-x11 +BuildRequires: imake +BuildRequires: libXt-devel +BuildRequires: xorg-x11-server-utils %description xfce4-session is the session manager for the Xfce desktop environment. @@ -85,6 +88,10 @@ %{_libexecdir}/balou-* %changelog +* Tue Jan 31 2006 Kevin Fenzi - 4.2.3-2.fc5 +- Added xorg-x11-server-utils, imake, libXt-devel BuildRequires +- Added xorg-x11-server-utils to Requires + * Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 - Update to 4.2.3 - Added dist tag From fedora-extras-commits at redhat.com Wed Feb 1 04:17:19 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 31 Jan 2006 23:17:19 -0500 Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec,1.6,1.7 Message-ID: <200602010417.k114HpiP007449@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce-mcs-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7432 Modified Files: xfce-mcs-plugins.spec Log Message: Added imake and libXt-devel BuildRequires for modular xorg Index: xfce-mcs-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce-mcs-plugins.spec 12 Nov 2005 18:00:16 -0000 1.6 +++ xfce-mcs-plugins.spec 1 Feb 2006 04:17:19 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-mcs-plugins-4.2.3.tar.gz @@ -15,6 +15,8 @@ BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: libxfce4util-devel >= %{version} BuildRequires: libxfce4mcs-devel >= %{version} +BuildRequires: imake +BuildRequires: libXt-devel %description This package inlcudes a set of plugins for the multi channel @@ -51,6 +53,9 @@ %{_datadir}/icons/*/*/apps/* %changelog +* Tue Jan 31 2006 Kevin Fenzi - 4.2.3-2.fc5 +- Added imake and libXt-devel BuildRequires for modular xorg + * Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 - Update to 4.2.3 - Added dist tag From fedora-extras-commits at redhat.com Wed Feb 1 04:28:04 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 31 Jan 2006 23:28:04 -0500 Subject: rpms/xfce-utils/devel xfce-utils.spec,1.6,1.7 Message-ID: <200602010428.k114Sa0g007532@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7515 Modified Files: xfce-utils.spec Log Message: Added imake and libXt-devel BuildRequires for modular xorg Index: xfce-utils.spec =================================================================== RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce-utils.spec 12 Nov 2005 18:30:23 -0000 1.6 +++ xfce-utils.spec 1 Feb 2006 04:28:04 -0000 1.7 @@ -3,7 +3,7 @@ Summary: Utilities for the Xfce Desktop Environment Name: xfce-utils Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-utils-4.2.3.tar.gz @@ -17,6 +17,8 @@ BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: libxfce4mcs-devel >= %{version} BuildRequires: xfce-mcs-manager-devel +BuildRequires: imake +BuildRequires: libXt-devel %description This package includes utilities for the Xfce Desktop Environment @@ -62,6 +64,9 @@ %{xsessiondir}/* %changelog +* Tue Jan 31 2006 Kevin Fenzi - 4.2.3-2.fc5 +- Added imake and libXt-devel BuildRequires for modular xorg + * Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 - Update to 4.2.3 - Added dist tag From fedora-extras-commits at redhat.com Wed Feb 1 04:38:58 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 31 Jan 2006 23:38:58 -0500 Subject: rpms/xfdesktop/devel xfdesktop.spec,1.8,1.9 Message-ID: <200602010439.k114dVsN007631@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfdesktop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7614 Modified Files: xfdesktop.spec Log Message: Added imake and libXt-devel BuildRequires for modular xorg Index: xfdesktop.spec =================================================================== RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xfdesktop.spec 12 Nov 2005 18:17:05 -0000 1.8 +++ xfdesktop.spec 1 Feb 2006 04:38:58 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Desktop manager for the XFce Desktop Environment Name: xfdesktop Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfdesktop-4.2.3.tar.gz @@ -21,6 +21,8 @@ BuildRequires: xfce4-panel-devel >= %{version} BuildRequires: libxml2-devel BuildRequires: xfce-mcs-manager-devel +BuildRequires: imake +BuildRequires: libXt-devel %description This package includes a desktop manager for the XFce Desktop Environment @@ -63,6 +65,9 @@ %{_mandir}/man1/* %changelog +* Tue Jan 31 2006 Kevin Fenzi - 4.2.3-2.fc5 +- Added imake and libXt-devel BuildRequires for modular xorg + * Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 - Update to 4.2.3 - Added dist tag From fedora-extras-commits at redhat.com Wed Feb 1 05:04:49 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 1 Feb 2006 00:04:49 -0500 Subject: rpms/xffm/devel xffm.spec,1.10,1.11 Message-ID: <200602010505.k1155LSJ009567@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xffm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9550 Modified Files: xffm.spec Log Message: Added imake and libXt-devel BuildRequires for modular xorg Index: xffm.spec =================================================================== RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xffm.spec 12 Nov 2005 18:21:37 -0000 1.10 +++ xffm.spec 1 Feb 2006 05:04:48 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Next generation filemanager and SMB network navigator for Xfce4 Name: xffm Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xffm-4.2.3.tar.gz @@ -25,6 +25,8 @@ BuildRequires: libxml2-devel >= 2.4.0 BuildRequires: xfce-mcs-manager-devel >= %{version} BuildRequires: librsvg2-devel +BuildRequires: imake +BuildRequires: libXt-devel %description This package includes a filemanager and SMB network navigator for Xfce4. @@ -66,6 +68,9 @@ %{_mandir}/man?/* %changelog +* Tue Jan 31 2006 Kevin Fenzi - 4.2.3-2.fc5 +- Added imake and libXt-devel BuildRequires for modular xorg + * Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 - Update to 4.2.3 - Added dist tag From fedora-extras-commits at redhat.com Wed Feb 1 05:36:22 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 00:36:22 -0500 Subject: rpms/perl-Class-Autouse/devel .cvsignore, 1.3, 1.4 perl-Class-Autouse.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200602010536.k115asMm009713@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Autouse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9692 Modified Files: .cvsignore perl-Class-Autouse.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Sep 2005 12:29:40 -0000 1.3 +++ .cvsignore 1 Feb 2006 05:36:22 -0000 1.4 @@ -1 +1 @@ -Class-Autouse-1.21.tar.gz +Class-Autouse-1.24.tar.gz Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Autouse.spec 28 Sep 2005 12:29:40 -0000 1.3 +++ perl-Class-Autouse.spec 1 Feb 2006 05:36:22 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Class-Autouse -Version: 1.21 +Version: 1.24 Release: 1%{?dist} Summary: Run-time class loading on first method call License: GPL or Artistic @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Sat Jan 14 2006 Ralf Corsepius - 1.24-1 +- Upstream update. + * Wed Sep 28 2005 Ralf Corsepius - 1.21-1 - Upstream update. - Fix bogus dep on perl(Carp). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Sep 2005 12:29:40 -0000 1.3 +++ sources 1 Feb 2006 05:36:22 -0000 1.4 @@ -1 +1 @@ -3bf4fadd8349e57d6af0961b6565c74f Class-Autouse-1.21.tar.gz +6192abd3fa36d40ae40870ea66aa9b2a Class-Autouse-1.24.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 05:39:54 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 00:39:54 -0500 Subject: rpms/perl-Class-Autouse/FC-4 .cvsignore, 1.3, 1.4 perl-Class-Autouse.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200602010540.k115eQoI009782@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Autouse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9759 Modified Files: .cvsignore perl-Class-Autouse.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Sep 2005 13:21:38 -0000 1.3 +++ .cvsignore 1 Feb 2006 05:39:54 -0000 1.4 @@ -1 +1 @@ -Class-Autouse-1.21.tar.gz +Class-Autouse-1.24.tar.gz Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/perl-Class-Autouse.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Autouse.spec 29 Sep 2005 13:21:38 -0000 1.3 +++ perl-Class-Autouse.spec 1 Feb 2006 05:39:54 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Class-Autouse -Version: 1.21 +Version: 1.24 Release: 1%{?dist} Summary: Run-time class loading on first method call License: GPL or Artistic @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Sat Jan 14 2006 Ralf Corsepius - 1.24-1 +- Upstream update. + * Wed Sep 28 2005 Ralf Corsepius - 1.21-1 - Upstream update. - Fix bogus dep on perl(Carp). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Sep 2005 13:21:38 -0000 1.3 +++ sources 1 Feb 2006 05:39:54 -0000 1.4 @@ -1 +1 @@ -3bf4fadd8349e57d6af0961b6565c74f Class-Autouse-1.21.tar.gz +6192abd3fa36d40ae40870ea66aa9b2a Class-Autouse-1.24.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 05:53:20 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 00:53:20 -0500 Subject: rpms/perl-Params-Validate/devel .cvsignore, 1.3, 1.4 perl-Params-Validate.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200602010553.k115rq5i009921@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-serv9883/devel Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jan 2006 07:50:04 -0000 1.3 +++ .cvsignore 1 Feb 2006 05:53:20 -0000 1.4 @@ -1 +1 @@ -Params-Validate-0.79.tar.gz +Params-Validate-0.80.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Params-Validate.spec 19 Jan 2006 07:50:04 -0000 1.3 +++ perl-Params-Validate.spec 1 Feb 2006 05:53:20 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.79 +Version: 0.80 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 01 2006 Ralf Cors??pius - 0.80-1 +- Upstream update. + * Sat Jan 14 2006 Ralf Cors??pius - 0.79-1 - Upstream update. - BR perl(Readonly), perl(Readonly::XS). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jan 2006 07:50:04 -0000 1.3 +++ sources 1 Feb 2006 05:53:20 -0000 1.4 @@ -1 +1 @@ -3e0a710c3cb2c40000999071442c368e Params-Validate-0.79.tar.gz +37acde17038290becdef848f566698d6 Params-Validate-0.80.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 05:53:26 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 00:53:26 -0500 Subject: rpms/perl-Params-Validate/FC-4 .cvsignore, 1.3, 1.4 perl-Params-Validate.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200602010553.k115rwCW009926@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-serv9883/FC-4 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jan 2006 08:04:30 -0000 1.3 +++ .cvsignore 1 Feb 2006 05:53:25 -0000 1.4 @@ -1 +1 @@ -Params-Validate-0.79.tar.gz +Params-Validate-0.80.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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Params-Validate.spec 19 Jan 2006 08:04:31 -0000 1.3 +++ perl-Params-Validate.spec 1 Feb 2006 05:53:25 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.79 +Version: 0.80 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 01 2006 Ralf Cors??pius - 0.80-1 +- Upstream update. + * Sat Jan 14 2006 Ralf Cors??pius - 0.79-1 - Upstream update. - BR perl(Readonly), perl(Readonly::XS). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jan 2006 08:04:31 -0000 1.3 +++ sources 1 Feb 2006 05:53:25 -0000 1.4 @@ -1 +1 @@ -3e0a710c3cb2c40000999071442c368e Params-Validate-0.79.tar.gz +37acde17038290becdef848f566698d6 Params-Validate-0.80.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 06:27:17 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 01:27:17 -0500 Subject: rpms/perl-File-Slurp/devel .cvsignore, 1.2, 1.3 perl-File-Slurp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200602010628.k116S2Xa012030@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968/devel Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 02:15:28 -0000 1.2 +++ .cvsignore 1 Feb 2006 06:27:17 -0000 1.3 @@ -1 +1 @@ -File-Slurp-9999.09.tar.gz +File-Slurp-9999.11.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-Slurp.spec 10 Sep 2005 02:19:50 -0000 1.2 +++ perl-File-Slurp.spec 1 Feb 2006 06:27:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-File-Slurp -Version: 9999.09 -Release: 2%{?dist} +Version: 9999.11 +Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic Group: Development/Libraries @@ -11,6 +11,9 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 +BuildRequires: perl(Test::Pod) >= 1.14 + %description This module provides subs that allow you to read or write entire files with one simple call. They are designed to be simple to use, have flexible ways @@ -50,6 +53,10 @@ %{_mandir}/man3/* %changelog +* Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 +- Upstream update. +- BR perl(Test::Pod), perl(Test::Pod::Coverage). + * Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 - Apply JPO's patch (PR #167282). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 02:15:28 -0000 1.2 +++ sources 1 Feb 2006 06:27:17 -0000 1.3 @@ -1 +1 @@ -b2bd4e917b6fafe03145f3977ba8bd7a File-Slurp-9999.09.tar.gz +f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 06:27:29 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 01:27:29 -0500 Subject: rpms/perl-File-Slurp/FC-3 .cvsignore, 1.2, 1.3 perl-File-Slurp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200602010628.k116S2V9012029@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968/FC-3 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 02:15:28 -0000 1.2 +++ .cvsignore 1 Feb 2006 06:27:29 -0000 1.3 @@ -1 +1 @@ -File-Slurp-9999.09.tar.gz +File-Slurp-9999.11.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/perl-File-Slurp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-Slurp.spec 10 Sep 2005 02:19:50 -0000 1.2 +++ perl-File-Slurp.spec 1 Feb 2006 06:27:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-File-Slurp -Version: 9999.09 -Release: 2%{?dist} +Version: 9999.11 +Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic Group: Development/Libraries @@ -11,6 +11,9 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 +BuildRequires: perl(Test::Pod) >= 1.14 + %description This module provides subs that allow you to read or write entire files with one simple call. They are designed to be simple to use, have flexible ways @@ -50,6 +53,10 @@ %{_mandir}/man3/* %changelog +* Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 +- Upstream update. +- BR perl(Test::Pod), perl(Test::Pod::Coverage). + * Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 - Apply JPO's patch (PR #167282). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 02:15:28 -0000 1.2 +++ sources 1 Feb 2006 06:27:29 -0000 1.3 @@ -1 +1 @@ -b2bd4e917b6fafe03145f3977ba8bd7a File-Slurp-9999.09.tar.gz +f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 06:27:23 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 01:27:23 -0500 Subject: rpms/perl-File-Slurp/FC-4 .cvsignore, 1.2, 1.3 perl-File-Slurp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200602010628.k116S20D012028@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968/FC-4 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 02:15:28 -0000 1.2 +++ .cvsignore 1 Feb 2006 06:27:23 -0000 1.3 @@ -1 +1 @@ -File-Slurp-9999.09.tar.gz +File-Slurp-9999.11.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/perl-File-Slurp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-Slurp.spec 10 Sep 2005 02:19:50 -0000 1.2 +++ perl-File-Slurp.spec 1 Feb 2006 06:27:23 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-File-Slurp -Version: 9999.09 -Release: 2%{?dist} +Version: 9999.11 +Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic Group: Development/Libraries @@ -11,6 +11,9 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 +BuildRequires: perl(Test::Pod) >= 1.14 + %description This module provides subs that allow you to read or write entire files with one simple call. They are designed to be simple to use, have flexible ways @@ -50,6 +53,10 @@ %{_mandir}/man3/* %changelog +* Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 +- Upstream update. +- BR perl(Test::Pod), perl(Test::Pod::Coverage). + * Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 - Apply JPO's patch (PR #167282). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 02:15:28 -0000 1.2 +++ sources 1 Feb 2006 06:27:23 -0000 1.3 @@ -1 +1 @@ -b2bd4e917b6fafe03145f3977ba8bd7a File-Slurp-9999.09.tar.gz +f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 08:15:40 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 1 Feb 2006 03:15:40 -0500 Subject: rpms/perl-Class-Loader - New directory Message-ID: <200602010815.k118FgdH016301@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Class-Loader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16293/perl-Class-Loader Log Message: Directory /cvs/extras/rpms/perl-Class-Loader added to the repository From fedora-extras-commits at redhat.com Wed Feb 1 08:15:45 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 1 Feb 2006 03:15:45 -0500 Subject: rpms/perl-Class-Loader/devel - New directory Message-ID: <200602010815.k118FlkN016316@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Class-Loader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16293/perl-Class-Loader/devel Log Message: Directory /cvs/extras/rpms/perl-Class-Loader/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 1 08:16:23 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 1 Feb 2006 03:16:23 -0500 Subject: rpms/perl-Class-Loader Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602010816.k118GPpd016350@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Class-Loader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16338 Added Files: Makefile import.log Log Message: Setup of module perl-Class-Loader --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-Loader all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Feb 1 08:16:29 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 1 Feb 2006 03:16:29 -0500 Subject: rpms/perl-Class-Loader/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602010816.k118GVQG016368@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Class-Loader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16338/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-Loader --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Feb 1 08:18:38 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 1 Feb 2006 03:18:38 -0500 Subject: rpms/perl-Class-Loader import.log,1.1,1.2 Message-ID: <200602010819.k118JAL9016439@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Class-Loader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16405 Modified Files: import.log Log Message: auto-import perl-Class-Loader-2.03-1 on branch devel from perl-Class-Loader-2.03-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Loader/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Feb 2006 08:16:23 -0000 1.1 +++ import.log 1 Feb 2006 08:18:38 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-Loader-2_03-1:HEAD:perl-Class-Loader-2.03-1.src.rpm:1138781902 From fedora-extras-commits at redhat.com Wed Feb 1 08:18:44 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 1 Feb 2006 03:18:44 -0500 Subject: rpms/perl-Class-Loader/devel perl-Class-Loader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602010819.k118JG5N016443@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Class-Loader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16405/devel Modified Files: .cvsignore sources Added Files: perl-Class-Loader.spec Log Message: auto-import perl-Class-Loader-2.03-1 on branch devel from perl-Class-Loader-2.03-1.src.rpm --- NEW FILE perl-Class-Loader.spec --- Summary: Load modules and create objects on demand Name: perl-Class-Loader Version: 2.03 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Class-Loader/ Source0: http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Class-Loader-%{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 Certain applications like to defer the decision to use a particular module till runtime. This is possible in perl, and is a useful trick in situations where the type of data is not known at compile time and the application doesn't wish to pre-compile modules to handle all types of data it can work with. Loading modules at runtime can also provide flexible interfaces for perl modules. Modules can let the programmer decide what modules will be used by it instead of hard-coding their names. Class::Loader is an inheritable class that provides a method, _load(), to load a module from disk and construct an object by calling its constructor. It also provides a way to map modules' names and associated metadata with symbolic names that can be used in place of module names at _load(). %prep %setup -q -n Class-Loader-%{version} %{__sed} -i -e '/^#! *\/usr\/bin\/perl /d' lib/Class/*.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %{__rm} -rf %{buildroot} %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';' /usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,0755) %doc ARTISTIC Changes %{perl_vendorlib}/Class/ %{_mandir}/man3/Class::Loader.3pm* %changelog * Mon Dec 5 2005 Paul Howarth 2.03-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Loader/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Feb 2006 08:16:29 -0000 1.1 +++ .cvsignore 1 Feb 2006 08:18:44 -0000 1.2 @@ -0,0 +1 @@ +Class-Loader-2.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Loader/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Feb 2006 08:16:29 -0000 1.1 +++ sources 1 Feb 2006 08:18:44 -0000 1.2 @@ -0,0 +1 @@ +2e2ace3429380e2dad2f0e82137511b8 Class-Loader-2.03.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 09:57:00 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 1 Feb 2006 04:57:00 -0500 Subject: owners owners.list,1.590,1.591 Message-ID: <200602010957.k119vW1s019617@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19592 Modified Files: owners.list Log Message: Add perl-Class-Loader Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.590 retrieving revision 1.591 diff -u -r1.590 -r1.591 --- owners.list 1 Feb 2006 01:41:14 -0000 1.590 +++ owners.list 1 Feb 2006 09:56:59 -0000 1.591 @@ -771,6 +771,7 @@ Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-ErrorHandler|Class::ErrorHandler Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Inspector|Get information about a class and its structure|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-Loader|Load modules and create objects on demand|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-ReturnValue|Class::ReturnValue Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Singleton|Class::Singleton Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Feb 1 10:09:37 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 1 Feb 2006 05:09:37 -0500 Subject: rpms/js/FC-4 js-1.5-va_copy.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 js.spec, 1.6, 1.7 sources, 1.2, 1.3 js-va_copy.patch, 1.1, NONE Message-ID: <200602011010.k11AABWP021460@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/js/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21436 Modified Files: .cvsignore js.spec sources Added Files: js-1.5-va_copy.patch Removed Files: js-va_copy.patch Log Message: Backport js 1.5 update from devel to FC-4. js-1.5-va_copy.patch: --- NEW FILE js-1.5-va_copy.patch --- diff -Naupr js.orig/src/config/Linux_All.mk js/src/config/Linux_All.mk --- js.orig/src/config/Linux_All.mk 2005-05-10 21:53:44.000000000 +0200 +++ js/src/config/Linux_All.mk 2006-01-26 11:38:12.000000000 +0100 @@ -91,8 +91,12 @@ endif JS_EDITLINE = 1 ifeq ($(CPU_ARCH),x86_64) -# Use VA_COPY() standard macro on x86-64 -# FIXME: better use it everywhere +# Use va_copy() standard macro on x86-64 +OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy +endif + +ifeq ($(CPU_ARCH),ppc) +# Use va_copy() standard macro on ppc too OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy endif diff -Naupr js.orig/src/jsprf.c js/src/jsprf.c --- js.orig/src/jsprf.c 2004-09-24 05:31:15.000000000 +0200 +++ js/src/jsprf.c 2006-01-26 11:34:52.000000000 +0100 @@ -55,7 +55,7 @@ ** and requires array notation. */ #ifdef HAVE_VA_COPY -#define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar) +#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar) #elif defined(HAVE_VA_LIST_AS_ARRAY) #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0] #else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/js/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:47:15 -0000 1.2 +++ .cvsignore 1 Feb 2006 10:09:37 -0000 1.3 @@ -1 +1 @@ -js-1.5-rc6a.tar.gz +js-1.5.tar.gz Index: js.spec =================================================================== RCS file: /cvs/extras/rpms/js/FC-4/js.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- js.spec 19 Apr 2005 20:19:07 -0000 1.6 +++ js.spec 1 Feb 2006 10:09:37 -0000 1.7 @@ -1,11 +1,9 @@ %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} -%define real_version 1.5-rc6a - Summary: JavaScript interpreter and libraries Name: js Version: 1.5 -Release: 0.rc6a.6 +Release: 2%{?dist} %if 0%{?_without_readline:1} License: MPL/GPL/LGPL %else @@ -13,15 +11,14 @@ %endif Group: Development/Languages URL: http://www.mozilla.org/js/ -Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz +Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz Patch0: js-make.patch Patch1: js-shlib.patch -Patch2: js-perlconnect.patch -Patch3: js-va_copy.patch -Patch4: js-ldflags.patch +Patch2: js-1.5-va_copy.patch +Patch3: js-ldflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl >= 1:5.6.1 readline-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1, readline-devel Provides: libjs = %{version}-%{release} %description @@ -29,10 +26,11 @@ This package has been created for purposes of Sablotron and is suitable for embedding in applications. + %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release}, pkgconfig Provides: libjs-devel = %{version}-%{release} %description devel @@ -40,73 +38,109 @@ documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. + %prep %setup -q -n %{name} %patch0 -b .make %patch1 -b .shlib -%patch2 -b .perl -%patch3 -p 1 -b .vacopy -%patch4 -b .ldflags -cp src/perlconnect/README.html src/README.perlconnect.html +%patch2 -p1 -b .vacopy +%patch3 -b .ldflags +%{__cp} src/perlconnect/README.html src/README.perlconnect.html + +# Create pkgconfig file +%{__cat} > libjs.pc << 'EOF' +prefix=%{_prefix} +exec_prefix=${_prefix} +libdir=${_libdir} +includedir=${_includedir} + +Name: libjs +Description: JS library +Requires: +Version: %{version} +Libs: -L${libdir} -ljs +Cflags: -I${includedir} +EOF + %build export BUILD_OPT=1 %{__make} -C src -f Makefile.ref \ - XCFLAGS="%{optflags} -fPIC" \ - BUILD_OPT="1" \ + XCFLAGS="%{optflags} -fPIC" \ + BUILD_OPT="1" \ %if 0%{!?_without_readline:1} - JS_READLINE="1" \ + JS_READLINE="1" \ %endif - JS_PERLCONNECT="1" + JS_PERLCONNECT="1" cd src/perlconnect -MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}" + MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor + %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}" cd - + %install %{__rm} -rf %{buildroot} -%{__install} -d -m0755 %{buildroot}%{_bindir} \ - %{buildroot}%{_libdir} \ - %{buildroot}%{_includedir} -%{__install} -m0755 src/Linux_All_OPT.OBJ/js %{buildroot}%{_bindir} -%{__install} -m0755 src/Linux_All_OPT.OBJ/jscpucfg %{buildroot}%{_bindir} -%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.so %{buildroot}%{_libdir}/libjs.so.1 +%{__mkdir_p} %{buildroot}%{_bindir} \ + %{buildroot}%{_libdir}/pkgconfig \ + %{buildroot}%{_includedir} +%{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \ + %{buildroot}%{_bindir}/ +%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.{a,so} \ + %{buildroot}%{_libdir}/ +%{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so -%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.a %{buildroot}%{_libdir} -%{__install} -m0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \ - %{buildroot}%{_includedir} +%{__install} -m 0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \ + %{buildroot}%{_includedir}/ +%{__install} -m 0644 libjs.pc \ + %{buildroot}%{_libdir}/pkgconfig/ %{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -o -name jsperlbuild.pl | xargs -r rm find %{buildroot} -type f -name '*.bs' -a -size 0 | xargs -r rm -chmod -R u+w %{buildroot}/* + + +%clean +%{__rm} -rf %{buildroot} + %check || : ln -s libjs.so src/Linux_All_OPT.OBJ/libjs.so.1 LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -%{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) +%doc src/README*.html src/perlconnect/bg.jpg %{_bindir}/js %{_libdir}/*.so.* -%{perl_vendorarch}/auto/JS +%{perl_vendorarch}/auto/JS/ %{perl_vendorarch}/*.pm %files devel %defattr(-, root, root, 0755) -%doc src/README*.html src/perlconnect/bg.jpg %{_bindir}/jscpucfg +%{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %{_libdir}/*.a %{_includedir}/js*.h + %changelog +* Mon Jan 30 2006 Matthias Saou 1.5.0-2 +- Fix .pc file. + +* Thu Jan 26 2006 Matthias Saou 1.5.0-1 +- Update to 1.5.0 final. +- Spec file cleanups. +- Move docs from devel to main, since we need the license there. +- Remove no longer needed js-perlconnect.patch. +- Update js-1.5-va_copy.patch. +- Include a pkgconfig file (#178993). + * Tue Apr 19 2005 Ville Skytt?? - 1.5-0.rc6a.6 - Link shared lib with libperl. @@ -130,3 +164,4 @@ * Tue Mar 02 2004 Dag Wieers - 1.5-0.rc6 - Initial package. (using DAR) + Index: sources =================================================================== RCS file: /cvs/extras/rpms/js/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:47:15 -0000 1.2 +++ sources 1 Feb 2006 10:09:37 -0000 1.3 @@ -1 +1 @@ -43e55003be28b4329b9005aedcc0f015 js-1.5-rc6a.tar.gz +863bb6462f4ce535399a7c6276ae6776 js-1.5.tar.gz --- js-va_copy.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 1 10:39:24 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 1 Feb 2006 05:39:24 -0500 Subject: rpms/gwget/devel .cvsignore, 1.5, 1.6 gwget.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200602011039.k11Adu3c021643@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gwget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21622 Modified Files: .cvsignore gwget.spec sources Log Message: update to 0.97 and fix build with new epiphany Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Sep 2005 15:35:07 -0000 1.5 +++ .cvsignore 1 Feb 2006 10:39:23 -0000 1.6 @@ -1 +1 @@ -gwget-0.96.tar.gz +gwget-0.97.tar.bz2 Index: gwget.spec =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gwget.spec 22 Sep 2005 16:32:44 -0000 1.9 +++ gwget.spec 1 Feb 2006 10:39:23 -0000 1.10 @@ -1,12 +1,12 @@ -%define epimajor 1.8 +%define epimajor 1.9 Summary: Graphical download manager that uses wget Name: gwget -Version: 0.96 -Release: 4%{?dist} +Version: 0.97 +Release: 1%{?dist} License: GPL Group: Applications/Internet -Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz +Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2 Source1: gwget.desktop URL: http://gnome.org/projects/gwget Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +39,7 @@ %setup -q %build -%configure --with-epiphany-version=%{epimajor} +%configure make %{?_smp_mflags} %install @@ -90,6 +90,10 @@ %changelog +* Wed Feb 01 2006 Thorsten Leemhuis 0.97-1 +- Update to 0.97 +- Build with epiphany 1.9/2.0 + * Thu Sep 22 2005 Thorsten Leemhuis 0.96-4 - extension-dir is different on epiphany 1.8 - Own _libdir/epiphany Index: sources =================================================================== RCS file: /cvs/extras/rpms/gwget/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Sep 2005 15:35:07 -0000 1.5 +++ sources 1 Feb 2006 10:39:23 -0000 1.6 @@ -1 +1 @@ -f4c78534574300ce7997e9fdc3c3b6be gwget-0.96.tar.gz +b31dd63a2b55f1c0c2dea58490ca8cd2 gwget-0.97.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 1 10:59:32 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 1 Feb 2006 05:59:32 -0500 Subject: rpms/js/FC-3 js-1.5-va_copy.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 js.spec, 1.5, 1.6 sources, 1.2, 1.3 js-va_copy.patch, 1.1, NONE Message-ID: <200602011100.k11B050x021824@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/js/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21790 Modified Files: .cvsignore js.spec sources Added Files: js-1.5-va_copy.patch Removed Files: js-va_copy.patch Log Message: Bakport js 1.5 from devel to FC-3. js-1.5-va_copy.patch: --- NEW FILE js-1.5-va_copy.patch --- diff -Naupr js.orig/src/config/Linux_All.mk js/src/config/Linux_All.mk --- js.orig/src/config/Linux_All.mk 2005-05-10 21:53:44.000000000 +0200 +++ js/src/config/Linux_All.mk 2006-01-26 11:38:12.000000000 +0100 @@ -91,8 +91,12 @@ endif JS_EDITLINE = 1 ifeq ($(CPU_ARCH),x86_64) -# Use VA_COPY() standard macro on x86-64 -# FIXME: better use it everywhere +# Use va_copy() standard macro on x86-64 +OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy +endif + +ifeq ($(CPU_ARCH),ppc) +# Use va_copy() standard macro on ppc too OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy endif diff -Naupr js.orig/src/jsprf.c js/src/jsprf.c --- js.orig/src/jsprf.c 2004-09-24 05:31:15.000000000 +0200 +++ js/src/jsprf.c 2006-01-26 11:34:52.000000000 +0100 @@ -55,7 +55,7 @@ ** and requires array notation. */ #ifdef HAVE_VA_COPY -#define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar) +#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar) #elif defined(HAVE_VA_LIST_AS_ARRAY) #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0] #else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/js/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:47:15 -0000 1.2 +++ .cvsignore 1 Feb 2006 10:59:31 -0000 1.3 @@ -1 +1 @@ -js-1.5-rc6a.tar.gz +js-1.5.tar.gz Index: js.spec =================================================================== RCS file: /cvs/extras/rpms/js/FC-3/js.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- js.spec 19 Apr 2005 20:19:07 -0000 1.5 +++ js.spec 1 Feb 2006 10:59:31 -0000 1.6 @@ -1,11 +1,9 @@ %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} -%define real_version 1.5-rc6a - Summary: JavaScript interpreter and libraries Name: js Version: 1.5 -Release: 0.rc6a.4.1 +Release: 2%{?dist} %if 0%{?_without_readline:1} License: MPL/GPL/LGPL %else @@ -13,15 +11,14 @@ %endif Group: Development/Languages URL: http://www.mozilla.org/js/ -Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz +Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz Patch0: js-make.patch Patch1: js-shlib.patch -Patch2: js-perlconnect.patch -Patch3: js-va_copy.patch -Patch4: js-ldflags.patch +Patch2: js-1.5-va_copy.patch +Patch3: js-ldflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl >= 1:5.6.1 readline-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1, readline-devel Provides: libjs = %{version}-%{release} %description @@ -29,10 +26,11 @@ This package has been created for purposes of Sablotron and is suitable for embedding in applications. + %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release}, pkgconfig Provides: libjs-devel = %{version}-%{release} %description devel @@ -40,76 +38,115 @@ documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. + %prep %setup -q -n %{name} %patch0 -b .make %patch1 -b .shlib -%patch2 -b .perl -%patch3 -p 1 -b .vacopy -%patch4 -b .ldflags -cp src/perlconnect/README.html src/README.perlconnect.html +%patch2 -p1 -b .vacopy +%patch3 -b .ldflags +%{__cp} src/perlconnect/README.html src/README.perlconnect.html + +# Create pkgconfig file +%{__cat} > libjs.pc << 'EOF' +prefix=%{_prefix} +exec_prefix=${_prefix} +libdir=${_libdir} +includedir=${_includedir} + +Name: libjs +Description: JS library +Requires: +Version: %{version} +Libs: -L${libdir} -ljs +Cflags: -I${includedir} +EOF + %build export BUILD_OPT=1 %{__make} -C src -f Makefile.ref \ - XCFLAGS="%{optflags} -fPIC" \ - BUILD_OPT="1" \ + XCFLAGS="%{optflags} -fPIC" \ + BUILD_OPT="1" \ %if 0%{!?_without_readline:1} - JS_READLINE="1" \ + JS_READLINE="1" \ %endif - JS_PERLCONNECT="1" + JS_PERLCONNECT="1" cd src/perlconnect -MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}" + MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor + %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}" cd - + %install %{__rm} -rf %{buildroot} -%{__install} -d -m0755 %{buildroot}%{_bindir} \ - %{buildroot}%{_libdir} \ - %{buildroot}%{_includedir} -%{__install} -m0755 src/Linux_All_OPT.OBJ/js %{buildroot}%{_bindir} -%{__install} -m0755 src/Linux_All_OPT.OBJ/jscpucfg %{buildroot}%{_bindir} -%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.so %{buildroot}%{_libdir}/libjs.so.1 +%{__mkdir_p} %{buildroot}%{_bindir} \ + %{buildroot}%{_libdir}/pkgconfig \ + %{buildroot}%{_includedir} +%{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \ + %{buildroot}%{_bindir}/ +%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.{a,so} \ + %{buildroot}%{_libdir}/ +%{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so -%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.a %{buildroot}%{_libdir} -%{__install} -m0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \ - %{buildroot}%{_includedir} +%{__install} -m 0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \ + %{buildroot}%{_includedir}/ +%{__install} -m 0644 libjs.pc \ + %{buildroot}%{_libdir}/pkgconfig/ %{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -o -name jsperlbuild.pl | xargs -r rm find %{buildroot} -type f -name '*.bs' -a -size 0 | xargs -r rm -chmod -R u+w %{buildroot}/* + + +%clean +%{__rm} -rf %{buildroot} + %check || : ln -s libjs.so src/Linux_All_OPT.OBJ/libjs.so.1 LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -%{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) +%doc src/README*.html src/perlconnect/bg.jpg %{_bindir}/js %{_libdir}/*.so.* -%{perl_vendorarch}/auto/JS +%{perl_vendorarch}/auto/JS/ %{perl_vendorarch}/*.pm %files devel %defattr(-, root, root, 0755) -%doc src/README*.html src/perlconnect/bg.jpg %{_bindir}/jscpucfg +%{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %{_libdir}/*.a %{_includedir}/js*.h + %changelog -* Tue Apr 19 2005 Ville Skytt?? - 1.5-0.rc6a.4.1 +* Mon Jan 30 2006 Matthias Saou 1.5.0-2 +- Fix .pc file. + +* Thu Jan 26 2006 Matthias Saou 1.5.0-1 +- Update to 1.5.0 final. +- Spec file cleanups. +- Move docs from devel to main, since we need the license there. +- Remove no longer needed js-perlconnect.patch. +- Update js-1.5-va_copy.patch. +- Include a pkgconfig file (#178993). + +* Tue Apr 19 2005 Ville Skytt?? - 1.5-0.rc6a.6 - Link shared lib with libperl. +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Mon Feb 14 2005 David Woodhouse - 1.5-0.rc6a.4 - Take js-va_copy.patch out of %ifarch x86_64 so it fixes the PPC build too @@ -127,3 +164,4 @@ * Tue Mar 02 2004 Dag Wieers - 1.5-0.rc6 - Initial package. (using DAR) + Index: sources =================================================================== RCS file: /cvs/extras/rpms/js/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:47:15 -0000 1.2 +++ sources 1 Feb 2006 10:59:31 -0000 1.3 @@ -1 +1 @@ -43e55003be28b4329b9005aedcc0f015 js-1.5-rc6a.tar.gz +863bb6462f4ce535399a7c6276ae6776 js-1.5.tar.gz --- js-va_copy.patch DELETED --- From fedora-extras-commits at redhat.com Wed Feb 1 11:51:49 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 06:51:49 -0500 Subject: rpms/fontforge/FC-4 .cvsignore, 1.6, 1.7 fontforge.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200602011152.k11BqLem023832@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fontforge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23796 Modified Files: .cvsignore fontforge.spec sources Log Message: * Wed Feb 01 2006 Roozbeh Pournader - 20060125-1 - Update to 20060125 (bug #170177) - Update docs to 20060114 - Change versioning to reflect upstream and follow packaging guidelines - Provide pfaedit (bug #176548) - Use %{?dist} tag (bug #176472) - Add localizations - No need to remove CVS subdir: fixed upstream - No need to covert man pages to UTF-8: fixed upstream - Fixed DOS line terminators - Use parallel build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 May 2005 19:31:10 -0000 1.6 +++ .cvsignore 1 Feb 2006 11:51:49 -0000 1.7 @@ -1,6 +1,2 @@ -fontforge_full-20041231.tgz -fontforge_htdocs-20041231.tgz -fontforge_full-20050310.tgz -fontforge_htdocs-20050310.tgz -fontforge_full-20050502.tgz -fontforge_htdocs-20050503.tgz +fontforge_full-20060125.tar.bz2 +fontforge_htdocs-20060114.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/fontforge.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fontforge.spec 30 Jul 2005 16:45:40 -0000 1.12 +++ fontforge.spec 1 Feb 2006 11:51:49 -0000 1.13 @@ -1,14 +1,17 @@ +%define docs_version 20060114 +%define gettext_package FontForge + Name: fontforge -Version: 0.0 -Release: 2.20050729.fc4 +Version: 20060125 +Release: 1%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://dl.sf.net/fontforge/fontforge_full-20050729.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2 Source1: fontforge.desktop -Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050729.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -22,6 +25,7 @@ BuildRequires: desktop-file-utils BuildRequires: libuninameslist-devel Obsoletes: pfaedit +Provides: pfaedit %description FontForge (former PfaEdit) is a font editor for outline and bitmap @@ -30,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n %{name}-20050729 +%setup -q -n %{name}-%{version} mkdir htdocs tar xzf %{SOURCE2} -C htdocs @@ -39,20 +43,18 @@ mkdir cidmaps tar xzf htdocs/cidmaps.tgz -C cidmaps -find . -name "CVS" -type d -print | xargs rm -r - -for i in fontforge/fontforge.1 fontforge/sfddiff.1 ; do - iconv -f iso-8859-1 -t utf-8 $i -o $i.utf8 ; mv $i.utf8 $i -done - sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in +# Fix bad line terminators +%{__sed} -i 's/\r//' htdocs/Big5.txt +%{__sed} -i 's/\r//' htdocs/corpchar.txt + %build export CPPFLAGS='-DDOCDIR=\"%{_docdir}/%{name}-%{version}/htdocs\"' %configure --with-regular-link --with-freetype-bytecode=no -# Parallel make not working. -make + +make %{?_smp_mflags} %install @@ -78,6 +80,9 @@ # remove the extra copy rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge +# Find translations +%find_lang %{gettext_package} + %clean rm -rf $RPM_BUILD_ROOT @@ -87,7 +92,7 @@ %postun -p /sbin/ldconfig -%files +%files -f %{gettext_package}.lang %defattr(-,root,root,-) %doc AUTHORS LICENSE htdocs %{_bindir}/* @@ -100,6 +105,18 @@ %changelog +* Wed Feb 01 2006 Roozbeh Pournader - 20060125-1 +- Update to 20060125 (bug #170177) +- Update docs to 20060114 +- Change versioning to reflect upstream and follow packaging guidelines +- Provide pfaedit (bug #176548) +- Use %%{?dist} tag (bug #176472) +- Add localizations +- No need to remove CVS subdir: fixed upstream +- No need to covert man pages to UTF-8: fixed upstream +- Fixed DOS line terminators +- Use parallel build + * Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc4 - Update to 20050729 - Remove .docview patch, looking for HTMLview is upstream so no longer needed Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jul 2005 16:44:54 -0000 1.7 +++ sources 1 Feb 2006 11:51:49 -0000 1.8 @@ -1,2 +1,2 @@ -81d8097c49ec559475664e6e26ecfb38 fontforge_full-20050729.tgz -3d42637f467c0344bb952cbc2b657aaa fontforge_htdocs-20050729.tgz +831ac5225b1a9b00b0b7bcf622c62fee fontforge_full-20060125.tar.bz2 +78a9f24e14c3e89afb5b88622f675546 fontforge_htdocs-20060114.tgz From fedora-extras-commits at redhat.com Wed Feb 1 12:33:42 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 07:33:42 -0500 Subject: rpms/fontforge/devel .cvsignore, 1.7, 1.8 fontforge.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200602011234.k11CYETH025828@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25807 Modified Files: .cvsignore fontforge.spec sources Log Message: * Wed Feb 01 2006 Roozbeh Pournader - 20060125-1 - Update to 20060125 (bug #170177) - Update docs to 20060114 - Change versioning to reflect upstream and follow packaging guidelines - Provide pfaedit (bug #176548) - Use %{?dist} tag (bug #176472) - Add localizations - No need to remove CVS subdir: fixed upstream - No need to covert man pages to UTF-8: fixed upstream - Fixed DOS line terminators - Use parallel build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jul 2005 16:26:33 -0000 1.7 +++ .cvsignore 1 Feb 2006 12:33:42 -0000 1.8 @@ -1,8 +1,2 @@ -fontforge_full-20041231.tgz -fontforge_htdocs-20041231.tgz -fontforge_full-20050310.tgz -fontforge_htdocs-20050310.tgz -fontforge_full-20050502.tgz -fontforge_htdocs-20050503.tgz -fontforge_full-20050729.tgz -fontforge_htdocs-20050729.tgz +fontforge_full-20060125.tar.bz2 +fontforge_htdocs-20060114.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fontforge.spec 30 Jul 2005 16:26:33 -0000 1.11 +++ fontforge.spec 1 Feb 2006 12:33:42 -0000 1.12 @@ -1,14 +1,17 @@ +%define docs_version 20060114 +%define gettext_package FontForge + Name: fontforge -Version: 0.0 -Release: 2.20050729.fc5 +Version: 20060125 +Release: 1%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://dl.sf.net/fontforge/fontforge_full-20050729.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2 Source1: fontforge.desktop -Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050729.tgz +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -22,6 +25,7 @@ BuildRequires: desktop-file-utils BuildRequires: libuninameslist-devel Obsoletes: pfaedit +Provides: pfaedit %description FontForge (former PfaEdit) is a font editor for outline and bitmap @@ -30,7 +34,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n %{name}-20050729 +%setup -q -n %{name}-%{version} mkdir htdocs tar xzf %{SOURCE2} -C htdocs @@ -39,20 +43,18 @@ mkdir cidmaps tar xzf htdocs/cidmaps.tgz -C cidmaps -find . -name "CVS" -type d -print | xargs rm -r - -for i in fontforge/fontforge.1 fontforge/sfddiff.1 ; do - iconv -f iso-8859-1 -t utf-8 $i -o $i.utf8 ; mv $i.utf8 $i -done - sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in +# Fix bad line terminators +%{__sed} -i 's/\r//' htdocs/Big5.txt +%{__sed} -i 's/\r//' htdocs/corpchar.txt + %build export CPPFLAGS='-DDOCDIR=\"%{_docdir}/%{name}-%{version}/htdocs\"' %configure --with-regular-link --with-freetype-bytecode=no -# Parallel make not working. -make + +make %{?_smp_mflags} %install @@ -78,6 +80,9 @@ # remove the extra copy rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge +# Find translations +%find_lang %{gettext_package} + %clean rm -rf $RPM_BUILD_ROOT @@ -87,7 +92,7 @@ %postun -p /sbin/ldconfig -%files +%files -f %{gettext_package}.lang %defattr(-,root,root,-) %doc AUTHORS LICENSE htdocs %{_bindir}/* @@ -100,7 +105,19 @@ %changelog -* Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc5 +* Wed Feb 01 2006 Roozbeh Pournader - 20060125-1 +- Update to 20060125 (bug #170177) +- Update docs to 20060114 +- Change versioning to reflect upstream and follow packaging guidelines +- Provide pfaedit (bug #176548) +- Use %%{?dist} tag (bug #176472) +- Add localizations +- No need to remove CVS subdir: fixed upstream +- No need to covert man pages to UTF-8: fixed upstream +- Fixed DOS line terminators +- Use parallel build + +* Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc4 - Update to 20050729 - Remove .docview patch, looking for HTMLview is upstream so no longer needed Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jul 2005 16:26:33 -0000 1.7 +++ sources 1 Feb 2006 12:33:42 -0000 1.8 @@ -1,2 +1,2 @@ -81d8097c49ec559475664e6e26ecfb38 fontforge_full-20050729.tgz -3d42637f467c0344bb952cbc2b657aaa fontforge_htdocs-20050729.tgz +831ac5225b1a9b00b0b7bcf622c62fee fontforge_full-20060125.tar.bz2 +78a9f24e14c3e89afb5b88622f675546 fontforge_htdocs-20060114.tgz From fedora-extras-commits at redhat.com Wed Feb 1 14:08:21 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:08:21 -0500 Subject: rpms/fontforge/devel fontforge.spec,1.12,1.13 Message-ID: <200602011408.k11E8s84029671@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29651 Modified Files: fontforge.spec Log Message: * Wed Feb 01 2006 Roozbeh Pournader - 20060125-2 - Remove XFree86-devel BuildReq Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fontforge.spec 1 Feb 2006 12:33:42 -0000 1.12 +++ fontforge.spec 1 Feb 2006 14:08:18 -0000 1.13 @@ -3,7 +3,7 @@ Name: fontforge Version: 20060125 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -105,6 +105,9 @@ %changelog +* Wed Feb 01 2006 Roozbeh Pournader - 20060125-2 +- Remove XFree86-devel BuildReq + * Wed Feb 01 2006 Roozbeh Pournader - 20060125-1 - Update to 20060125 (bug #170177) - Update docs to 20060114 From fedora-extras-commits at redhat.com Wed Feb 1 14:27:05 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 1 Feb 2006 09:27:05 -0500 Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec,1.2,1.3 Message-ID: <200602011427.k11ERdBC029878@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29858 Modified Files: mgopen-fonts.spec Log Message: Drop touching and ghosting of fonts.cache-{1,2} files for new fontconfig. Index: mgopen-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mgopen-fonts.spec 31 Oct 2005 12:33:12 -0000 1.2 +++ mgopen-fonts.spec 1 Feb 2006 14:27:05 -0000 1.3 @@ -4,7 +4,7 @@ Name: mgopen-fonts Version: 0.%{upstream_date} -Release: 2 +Release: 3%{?dist} Summary: Truetype greek fonts Group: User Interface/X License: Redistributable, with restrictions @@ -16,6 +16,7 @@ # The LICENCE file is an excerpt from the html page BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch +Conflicts: fontconfig < 2.3.93 %description @@ -31,16 +32,9 @@ %install /bin/rm -rf $RPM_BUILD_ROOT - -#fonts install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-2 - %clean /bin/rm -rf $RPM_BUILD_ROOT @@ -64,12 +58,12 @@ %doc LICENCE mgopen.html _files/ %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 -%ghost %{fontdir}/fonts.cache-2 - %changelog +* Sat Jan 28 2006 Sarantis Paskalis 0.20050515-3 +- remove ghosting of %{fontdir}/fonts.cache-{1,2} for new fontconfig + * Mon Oct 31 2005 Sarantis Paskalis 0.20050515-2 - add %{fontdir}/fonts.cache-2 to %ghost files. From fedora-extras-commits at redhat.com Wed Feb 1 14:28:57 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:28:57 -0500 Subject: rpms/fontforge/devel fontforge.spec,1.13,1.14 Message-ID: <200602011429.k11ETTCi029950@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29927 Modified Files: fontforge.spec Log Message: * Wed Feb 01 2006 Roozbeh Pournader - 20060125-3 - Really remove XFree86-devel BuildReq Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fontforge.spec 1 Feb 2006 14:08:18 -0000 1.13 +++ fontforge.spec 1 Feb 2006 14:28:57 -0000 1.14 @@ -3,7 +3,7 @@ Name: fontforge Version: 20060125 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -21,7 +21,6 @@ BuildRequires: libungif-devel BuildRequires: libxml2-devel BuildRequires: freetype-devel -BuildRequires: XFree86-devel BuildRequires: desktop-file-utils BuildRequires: libuninameslist-devel Obsoletes: pfaedit @@ -105,6 +104,9 @@ %changelog +* Wed Feb 01 2006 Roozbeh Pournader - 20060125-3 +- Really remove XFree86-devel BuildReq + * Wed Feb 01 2006 Roozbeh Pournader - 20060125-2 - Remove XFree86-devel BuildReq From fedora-extras-commits at redhat.com Wed Feb 1 14:35:06 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 09:35:06 -0500 Subject: rpms/perl-Class-Autouse/FC-4 .cvsignore, 1.4, 1.5 perl-Class-Autouse.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200602011435.k11EZc15030380@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Autouse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30302 Modified Files: .cvsignore perl-Class-Autouse.spec sources Log Message: - Revert to 1.21 (List::Util in Perl is too old). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Feb 2006 05:39:54 -0000 1.4 +++ .cvsignore 1 Feb 2006 14:35:06 -0000 1.5 @@ -1 +1,2 @@ +Class-Autouse-1.21.tar.gz Class-Autouse-1.24.tar.gz Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/perl-Class-Autouse.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-Autouse.spec 1 Feb 2006 05:39:54 -0000 1.4 +++ perl-Class-Autouse.spec 1 Feb 2006 14:35:06 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Class-Autouse -Version: 1.24 -Release: 1%{?dist} +Version: 1.21 +Release: 2%{?dist} Summary: Run-time class loading on first method call License: GPL or Artistic Group: Development/Libraries @@ -14,7 +14,11 @@ BuildRequires: perl(Test::More) >= 0.47 BuildRequires: perl(Carp) BuildRequires: perl(File::Spec) >= 0.82 +%if "%version" >= "1.24" +BuildRequires: perl(List::Util) >= 1.17 +%else BuildRequires: perl(List::Util) >= 1.11 +%endif # for improved tests BuildRequires: perl(Test::Pod) >= 1.00 @@ -53,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 01 2006 Ralf Corsepius - 1.21-2 +- Revert to 1.21 (List::Util in Perl is too old). + * Sat Jan 14 2006 Ralf Corsepius - 1.24-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Feb 2006 05:39:54 -0000 1.4 +++ sources 1 Feb 2006 14:35:06 -0000 1.5 @@ -1 +1,2 @@ +3bf4fadd8349e57d6af0961b6565c74f Class-Autouse-1.21.tar.gz 6192abd3fa36d40ae40870ea66aa9b2a Class-Autouse-1.24.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 14:35:45 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:35:45 -0500 Subject: owners owners.list,1.591,1.592 Message-ID: <200602011436.k11EaHVK030496@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30308 Modified Files: owners.list Log Message: + translate-toolkit Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.591 retrieving revision 1.592 diff -u -r1.591 -r1.592 --- owners.list 1 Feb 2006 09:56:59 -0000 1.591 +++ owners.list 1 Feb 2006 14:35:45 -0000 1.592 @@ -1274,6 +1274,7 @@ Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org| Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org| Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org| +Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org| Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Feb 1 14:35:58 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 1 Feb 2006 09:35:58 -0500 Subject: rpms/perl-Class-Autouse/devel .cvsignore, 1.4, 1.5 perl-Class-Autouse.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200602011436.k11EaUCC030518@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Autouse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30427 Modified Files: .cvsignore perl-Class-Autouse.spec sources Log Message: - Revert to 1.21 (List::Util in Perl is too old). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Feb 2006 05:36:22 -0000 1.4 +++ .cvsignore 1 Feb 2006 14:35:58 -0000 1.5 @@ -1 +1,2 @@ +Class-Autouse-1.21.tar.gz Class-Autouse-1.24.tar.gz Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-Autouse.spec 1 Feb 2006 05:36:22 -0000 1.4 +++ perl-Class-Autouse.spec 1 Feb 2006 14:35:58 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Class-Autouse -Version: 1.24 -Release: 1%{?dist} +Version: 1.21 +Release: 2%{?dist} Summary: Run-time class loading on first method call License: GPL or Artistic Group: Development/Libraries @@ -14,7 +14,11 @@ BuildRequires: perl(Test::More) >= 0.47 BuildRequires: perl(Carp) BuildRequires: perl(File::Spec) >= 0.82 +%if "%version" >= "1.24" +BuildRequires: perl(List::Util) >= 1.17 +%else BuildRequires: perl(List::Util) >= 1.11 +%endif # for improved tests BuildRequires: perl(Test::Pod) >= 1.00 @@ -53,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 01 2006 Ralf Corsepius - 1.21-2 +- Revert to 1.21 (List::Util in Perl is too old). + * Sat Jan 14 2006 Ralf Corsepius - 1.24-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Feb 2006 05:36:22 -0000 1.4 +++ sources 1 Feb 2006 14:35:58 -0000 1.5 @@ -1 +1,2 @@ +3bf4fadd8349e57d6af0961b6565c74f Class-Autouse-1.21.tar.gz 6192abd3fa36d40ae40870ea66aa9b2a Class-Autouse-1.24.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 14:39:47 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:39:47 -0500 Subject: rpms/translate-toolkit - New directory Message-ID: <200602011439.k11EdnWc030659@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30649/translate-toolkit Log Message: Directory /cvs/extras/rpms/translate-toolkit added to the repository From fedora-extras-commits at redhat.com Wed Feb 1 14:39:53 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:39:53 -0500 Subject: rpms/translate-toolkit/devel - New directory Message-ID: <200602011439.k11Edt2E030674@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30649/translate-toolkit/devel Log Message: Directory /cvs/extras/rpms/translate-toolkit/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 1 14:40:51 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:40:51 -0500 Subject: rpms/translate-toolkit Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602011440.k11Eer9M030717@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30705 Added Files: Makefile import.log Log Message: Setup of module translate-toolkit --- NEW FILE Makefile --- # Top level Makefile for module translate-toolkit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Feb 1 14:40:56 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:40:56 -0500 Subject: rpms/translate-toolkit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602011440.k11Eexgl030739@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30705/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module translate-toolkit --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: translate-toolkit # $Id$ NAME := translate-toolkit SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Feb 1 14:42:42 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:42:42 -0500 Subject: owners owners.list,1.592,1.593 Message-ID: <200602011443.k11EhFRN030836@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30773 Modified Files: owners.list Log Message: + python-enchant Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.592 retrieving revision 1.593 diff -u -r1.592 -r1.593 --- owners.list 1 Feb 2006 14:35:45 -0000 1.592 +++ owners.list 1 Feb 2006 14:42:42 -0000 1.593 @@ -1057,6 +1057,7 @@ Fedora Extras|python-docutils|A system for processing plaintext documentation|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org| 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| 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-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Feb 1 14:43:07 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:43:07 -0500 Subject: rpms/translate-toolkit import.log,1.1,1.2 Message-ID: <200602011443.k11Ehdn9030847@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805 Modified Files: import.log Log Message: auto-import translate-toolkit-0.8-0.5.rc5 on branch devel from translate-toolkit-0.8-0.5.rc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Feb 2006 14:40:51 -0000 1.1 +++ import.log 1 Feb 2006 14:43:06 -0000 1.2 @@ -0,0 +1 @@ +translate-toolkit-0_8-0_5_rc5:HEAD:translate-toolkit-0.8-0.5.rc5.src.rpm:1138804956 From fedora-extras-commits at redhat.com Wed Feb 1 14:43:12 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:43:12 -0500 Subject: rpms/translate-toolkit/devel translate-toolkit-0.8rc5-jtoolkit.patch, NONE, 1.1 translate-toolkit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602011443.k11Ehjou030851@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30805/devel Modified Files: .cvsignore sources Added Files: translate-toolkit-0.8rc5-jtoolkit.patch translate-toolkit.spec Log Message: auto-import translate-toolkit-0.8-0.5.rc5 on branch devel from translate-toolkit-0.8-0.5.rc5.src.rpm translate-toolkit-0.8rc5-jtoolkit.patch: --- NEW FILE translate-toolkit-0.8rc5-jtoolkit.patch --- --- translate-toolkit-0.8rc5/translate/filters/checks.py.jtoolkit 2006-01-09 18:17:50.000000000 +0330 +++ translate-toolkit-0.8rc5/translate/filters/checks.py 2006-01-09 18:18:26.000000000 +0330 @@ -38,11 +38,12 @@ for err in c: yield err.word, err.wordpos, err.suggest() except ImportError: - from jToolkit import spellcheck - dospellcheck = spellcheck.check -except ImportError: - def dospellcheck(text, lang): - return [] + try: + from jToolkit import spellcheck + dospellcheck = spellcheck.check + except ImportError: + def dospellcheck(text, lang): + return [] # actual test methods --- NEW FILE translate-toolkit.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 alphatag rc5 Name: translate-toolkit Version: 0.8 Release: 0.5.%{alphatag}%{?dist} Summary: A collection of tools to assist software localization Group: Development/Tools License: GPL URL: http://translate.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}%{alphatag}.tar.gz Patch1: translate-toolkit-0.8rc5-jtoolkit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-elementtree %description The Translate Toolkit includes programs to convert various localization formats to the common gettext PO format and vice versa, and programs to check and manage PO files. Also part of the package are programs to create word counts, merge translations, and perform various checks on PO files. %prep %setup -q -n %{name}-%{version}%{alphatag} %patch1 -p1 -b .jtoolkit %{__sed} -i 's/\r//' translate/doc/default.css %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 # This removes the documentation files that were installed in site-packages find $RPM_BUILD_ROOT%{python_sitelib}/translate -type f -name "[[:upper:]]*" | xargs rm -fv rm -rf $RPM_BUILD_ROOT%{python_sitelib}/translate/doc %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog translate/COPYING translate/README %doc translate/doc/* %dir %{python_sitelib}/translate %dir %{python_sitelib}/translate/tools %dir %{python_sitelib}/translate/filters %dir %{python_sitelib}/translate/storage %dir %{python_sitelib}/translate/misc %dir %{python_sitelib}/translate/convert %{python_sitelib}/translate/*.py %{python_sitelib}/translate/*.pyc %ghost %{python_sitelib}/translate/*.pyo %{python_sitelib}/translate/*/*.py %{python_sitelib}/translate/*/*.pyc %ghost %{python_sitelib}/translate/*/*.pyo %{_bindir}/* %changelog * Sat Jan 21 2006 Roozbeh Pournader - 0.8-0.5.rc5 - Use sed instead of dos2unix * Mon Jan 09 2006 Roozbeh Pournader - 0.8-0.4.rc5 - Own forgotten subdirectories * Mon Jan 09 2006 Roozbeh Pournader - 0.8-0.3.rc5 - Fix the jToolkit requirement * Sun Jan 08 2006 Roozbeh Pournader - 0.8-0.2.rc5 - Add %%{?dist} tag * Sat Jan 07 2006 Roozbeh Pournader - 0.8-0.1.rc5 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Feb 2006 14:40:56 -0000 1.1 +++ .cvsignore 1 Feb 2006 14:43:12 -0000 1.2 @@ -0,0 +1 @@ +translate-toolkit-0.8rc5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Feb 2006 14:40:56 -0000 1.1 +++ sources 1 Feb 2006 14:43:12 -0000 1.2 @@ -0,0 +1 @@ +f32e0c76cc043845f101feb8360d645f translate-toolkit-0.8rc5.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 14:47:31 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:47:31 -0500 Subject: rpms/python-enchant - New directory Message-ID: <200602011447.k11ElXj3030945@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/python-enchant In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30937/python-enchant Log Message: Directory /cvs/extras/rpms/python-enchant added to the repository From fedora-extras-commits at redhat.com Wed Feb 1 14:47:37 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:47:37 -0500 Subject: rpms/python-enchant/devel - New directory Message-ID: <200602011447.k11ElddI030960@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/python-enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30937/python-enchant/devel Log Message: Directory /cvs/extras/rpms/python-enchant/devel added to the repository From fedora-extras-commits at redhat.com Wed Feb 1 14:48:36 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:48:36 -0500 Subject: rpms/python-enchant Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602011448.k11EmcbC031001@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/python-enchant In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30989 Added Files: Makefile import.log Log Message: Setup of module python-enchant --- NEW FILE Makefile --- # Top level Makefile for module python-enchant all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 1 14:48:41 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:48:41 -0500 Subject: rpms/python-enchant/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602011448.k11EmhLv031021@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/python-enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30989/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-enchant --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-enchant # $Id$ NAME := python-enchant SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Feb 1 14:50:37 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:50:37 -0500 Subject: rpms/python-enchant import.log,1.1,1.2 Message-ID: <200602011451.k11Ep9E4031191@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/python-enchant In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31148 Modified Files: import.log Log Message: auto-import python-enchant-1.1.3-1 on branch devel from python-enchant-1.1.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-enchant/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Feb 2006 14:48:35 -0000 1.1 +++ import.log 1 Feb 2006 14:50:37 -0000 1.2 @@ -0,0 +1 @@ +python-enchant-1_1_3-1:HEAD:python-enchant-1.1.3-1.src.rpm:1138805407 From fedora-extras-commits at redhat.com Wed Feb 1 14:50:43 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 09:50:43 -0500 Subject: rpms/python-enchant/devel python-enchant.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602011451.k11EpFqJ031195@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/python-enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31148/devel Modified Files: .cvsignore sources Added Files: python-enchant.spec Log Message: auto-import python-enchant-1.1.3-1 on branch devel from python-enchant-1.1.3-1.src.rpm --- NEW FILE python-enchant.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-enchant Version: 1.1.3 Release: 1%{?dist} Summary: Python bindings for Enchant spellchecking library Group: Development/Languages License: LGPL URL: http://pyenchant.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/pyenchant/pyenchant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel enchant-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: enchant %description PyEnchant is a spellchecking library for Python, based on the Enchant library by Dom Lachowicz. %prep %setup -q -n pyenchant-%{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 rm -rf $RPM_BUILD_ROOT %define enchant_dir %{python_sitearch}/enchant %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt %dir %{enchant_dir} %dir %{enchant_dir}/checker %dir %{enchant_dir}/tokenize %{enchant_dir}/*.py %{enchant_dir}/*.pyc %ghost %{enchant_dir}/*.pyo %{enchant_dir}/*/*.py %{enchant_dir}/*/*.pyc %ghost %{enchant_dir}/*/*.pyo %{enchant_dir}/_enchant.so %changelog * Mon Jan 09 2006 Roozbeh Pournader - 1.1.3-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-enchant/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Feb 2006 14:48:41 -0000 1.1 +++ .cvsignore 1 Feb 2006 14:50:42 -0000 1.2 @@ -0,0 +1 @@ +pyenchant-1.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-enchant/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Feb 2006 14:48:41 -0000 1.1 +++ sources 1 Feb 2006 14:50:42 -0000 1.2 @@ -0,0 +1 @@ +31bb75201ec0252793e2b5b57df683c0 pyenchant-1.1.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 15:20:34 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 10:20:34 -0500 Subject: rpms/python-enchant/devel python-enchant.spec,1.1,1.2 Message-ID: <200602011521.k11FL7BV000698@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/python-enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv679 Modified Files: python-enchant.spec Log Message: * Wed Feb 01 2006 Roozbeh Pournader - 1.1.3-2 - Remove %{enchant_dir} macro - Add %dir for architecture-specific directory - Add "Provides:" for PyEnchant - Remove "Requires:" on enchant (Brian Pepple) Index: python-enchant.spec =================================================================== RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-enchant.spec 1 Feb 2006 14:50:42 -0000 1.1 +++ python-enchant.spec 1 Feb 2006 15:20:34 -0000 1.2 @@ -1,8 +1,9 @@ +%{!?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-enchant Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python bindings for Enchant spellchecking library Group: Development/Languages @@ -13,7 +14,8 @@ BuildRequires: python-devel enchant-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: enchant + +Provides: PyEnchant %description PyEnchant is a spellchecking library for Python, based on the Enchant @@ -37,22 +39,30 @@ rm -rf $RPM_BUILD_ROOT -%define enchant_dir %{python_sitearch}/enchant - %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt -%dir %{enchant_dir} -%dir %{enchant_dir}/checker -%dir %{enchant_dir}/tokenize -%{enchant_dir}/*.py -%{enchant_dir}/*.pyc -%ghost %{enchant_dir}/*.pyo -%{enchant_dir}/*/*.py -%{enchant_dir}/*/*.pyc -%ghost %{enchant_dir}/*/*.pyo -%{enchant_dir}/_enchant.so +# First the architecture-independent files +%dir %{python_sitelib}/enchant +%dir %{python_sitelib}/enchant/checker +%dir %{python_sitelib}/enchant/tokenize +%{python_sitelib}/enchant/*.py +%{python_sitelib}/enchant/*.pyc +%ghost %{python_sitelib}/enchant/*.pyo +%{python_sitelib}/enchant/*/*.py +%{python_sitelib}/enchant/*/*.pyc +%ghost %{python_sitelib}/enchant/*/*.pyo +# Now the architecture-specific files +%dir %{python_sitearch}/enchant +%{python_sitearch}/enchant/_enchant.so + %changelog +* Wed Feb 01 2006 Roozbeh Pournader - 1.1.3-2 +- Remove %%{enchant_dir} macro +- Add %%dir for architecture-specific directory +- Add "Provides:" for PyEnchant +- Remove "Requires:" on enchant (Brian Pepple) + * Mon Jan 09 2006 Roozbeh Pournader - 1.1.3-1 - Initial packaging From fedora-extras-commits at redhat.com Wed Feb 1 15:40:15 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Wed, 1 Feb 2006 10:40:15 -0500 Subject: rpms/gazpacho/FC-4 .cvsignore, 1.9, 1.10 gazpacho.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200602011540.k11Fem4o000878@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/gazpacho/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv834/FC-4 Modified Files: .cvsignore gazpacho.spec sources Log Message: Version 0.6.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gazpacho/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Jan 2006 16:24:57 -0000 1.9 +++ .cvsignore 1 Feb 2006 15:40:15 -0000 1.10 @@ -1 +1 @@ -gazpacho-0.6.4.tar.bz2 +gazpacho-0.6.5.tar.bz2 Index: gazpacho.spec =================================================================== RCS file: /cvs/extras/rpms/gazpacho/FC-4/gazpacho.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gazpacho.spec 12 Jan 2006 16:24:57 -0000 1.15 +++ gazpacho.spec 1 Feb 2006 15:40:15 -0000 1.16 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gazpacho -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} Summary: Glade Interface Creator @@ -73,6 +73,9 @@ %changelog +* Wed Feb 01 2006 Konstantin Ryabitsev - 0.6.5-1 +- Version 0.6.5 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.6.4-1 - Version 0.6.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gazpacho/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Jan 2006 16:24:59 -0000 1.9 +++ sources 1 Feb 2006 15:40:15 -0000 1.10 @@ -1 +1 @@ -2c7f482ead7f7fb304d92262f686a124 gazpacho-0.6.4.tar.bz2 +853d2df3bcf3205848e695177bdba6a8 gazpacho-0.6.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 1 15:40:21 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Wed, 1 Feb 2006 10:40:21 -0500 Subject: rpms/gazpacho/devel .cvsignore, 1.10, 1.11 gazpacho.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <200602011540.k11FesHQ000883@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/gazpacho/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv834/devel Modified Files: .cvsignore gazpacho.spec sources Log Message: Version 0.6.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 12 Jan 2006 16:25:06 -0000 1.10 +++ .cvsignore 1 Feb 2006 15:40:21 -0000 1.11 @@ -1 +1 @@ -gazpacho-0.6.4.tar.bz2 +gazpacho-0.6.5.tar.bz2 Index: gazpacho.spec =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gazpacho.spec 12 Jan 2006 16:25:07 -0000 1.16 +++ gazpacho.spec 1 Feb 2006 15:40:21 -0000 1.17 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gazpacho -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} Summary: Glade Interface Creator @@ -73,6 +73,9 @@ %changelog +* Wed Feb 01 2006 Konstantin Ryabitsev - 0.6.5-1 +- Version 0.6.5 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.6.4-1 - Version 0.6.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 12 Jan 2006 16:25:07 -0000 1.10 +++ sources 1 Feb 2006 15:40:21 -0000 1.11 @@ -1 +1 @@ -2c7f482ead7f7fb304d92262f686a124 gazpacho-0.6.4.tar.bz2 +853d2df3bcf3205848e695177bdba6a8 gazpacho-0.6.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Feb 1 15:56:34 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 10:56:34 -0500 Subject: rpms/fontforge/devel fontforge.spec,1.14,1.15 Message-ID: <200602011557.k11Fv6CO001071@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1044 Modified Files: fontforge.spec Log Message: * Wed Feb 01 2006 Roozbeh Pournader - 20060125-4 - Add "BuildRequires:" on libXt-devel and xorg-x11-proto-devel Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fontforge.spec 1 Feb 2006 14:28:57 -0000 1.14 +++ fontforge.spec 1 Feb 2006 15:56:33 -0000 1.15 @@ -3,7 +3,7 @@ Name: fontforge Version: 20060125 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview + BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: libpng-devel @@ -23,6 +24,9 @@ BuildRequires: freetype-devel BuildRequires: desktop-file-utils BuildRequires: libuninameslist-devel +BuildRequires: libXt-devel +BuildRequires: xorg-x11-proto-devel + Obsoletes: pfaedit Provides: pfaedit @@ -104,6 +108,9 @@ %changelog +* Wed Feb 01 2006 Roozbeh Pournader - 20060125-4 +- Add "BuildRequires:" on libXt-devel and xorg-x11-proto-devel + * Wed Feb 01 2006 Roozbeh Pournader - 20060125-3 - Really remove XFree86-devel BuildReq From fedora-extras-commits at redhat.com Wed Feb 1 16:07:44 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 1 Feb 2006 11:07:44 -0500 Subject: rpms/python-enchant/devel python-enchant.spec,1.2,1.3 Message-ID: <200602011608.k11G8RvR002881@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/python-enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2858 Modified Files: python-enchant.spec Log Message: * Wed Feb 01 2006 Roozbeh Pournader - 1.1.3-3 - Use %{python_sitearch} instead of %{python_sitelib} (for x86_64) Index: python-enchant.spec =================================================================== RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-enchant.spec 1 Feb 2006 15:20:34 -0000 1.2 +++ python-enchant.spec 1 Feb 2006 16:07:44 -0000 1.3 @@ -1,9 +1,8 @@ -%{!?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-enchant Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python bindings for Enchant spellchecking library Group: Development/Languages @@ -42,22 +41,22 @@ %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt -# First the architecture-independent files -%dir %{python_sitelib}/enchant -%dir %{python_sitelib}/enchant/checker -%dir %{python_sitelib}/enchant/tokenize -%{python_sitelib}/enchant/*.py -%{python_sitelib}/enchant/*.pyc -%ghost %{python_sitelib}/enchant/*.pyo -%{python_sitelib}/enchant/*/*.py -%{python_sitelib}/enchant/*/*.pyc -%ghost %{python_sitelib}/enchant/*/*.pyo -# Now the architecture-specific files %dir %{python_sitearch}/enchant +%dir %{python_sitearch}/enchant/checker +%dir %{python_sitearch}/enchant/tokenize +%{python_sitearch}/enchant/*.py +%{python_sitearch}/enchant/*.pyc +%ghost %{python_sitearch}/enchant/*.pyo +%{python_sitearch}/enchant/*/*.py +%{python_sitearch}/enchant/*/*.pyc +%ghost %{python_sitearch}/enchant/*/*.pyo %{python_sitearch}/enchant/_enchant.so %changelog +* Wed Feb 01 2006 Roozbeh Pournader - 1.1.3-3 +- Use %%{python_sitearch} instead of %%{python_sitelib} (for x86_64) + * Wed Feb 01 2006 Roozbeh Pournader - 1.1.3-2 - Remove %%{enchant_dir} macro - Add %%dir for architecture-specific directory From fedora-extras-commits at redhat.com Wed Feb 1 16:34:10 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Feb 2006 11:34:10 -0500 Subject: rpms/kdesvn/devel .cvsignore, 1.5, 1.6 kdesvn.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200602011634.k11GYhak003102@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3076 Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Jan 2006 16:39:54 -0000 1.5 +++ .cvsignore 1 Feb 2006 16:34:10 -0000 1.6 @@ -1 +1 @@ -kdesvn-0.7.2.tar.gz +kdesvn-0.7.3.tar.gz Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kdesvn.spec 20 Jan 2006 16:39:54 -0000 1.10 +++ kdesvn.spec 1 Feb 2006 16:34:10 -0000 1.11 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration @@ -97,6 +97,9 @@ %changelog +* Wed Feb 1 2006 - Orion Poplawski - 0.7.3-1 +- Update to 0.7.3 + * Fri Jan 20 2006 - Orion Poplawski - 0.7.2-1 - Update to 0.7.2 - Remove gcc41 patch fixed upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Jan 2006 16:39:54 -0000 1.5 +++ sources 1 Feb 2006 16:34:10 -0000 1.6 @@ -1 +1 @@ -7ebc3e786bab67f23826df99a1828b08 kdesvn-0.7.2.tar.gz +db4e90a3776f9cd524e6cb432b566c73 kdesvn-0.7.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 16:36:10 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 1 Feb 2006 11:36:10 -0500 Subject: rpms/git-core/devel .cvsignore, 1.16, 1.17 git.spec, 1.4, 1.5 sources, 1.16, 1.17 Message-ID: <200602011636.k11Gagxo003184@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3162 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 24 Jan 2006 22:44:00 -0000 1.16 +++ .cvsignore 1 Feb 2006 16:36:09 -0000 1.17 @@ -1 +1 @@ -git-1.1.4.tar.gz +git-1.1.6.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- git.spec 24 Jan 2006 22:44:00 -0000 1.4 +++ git.spec 1 Feb 2006 16:36:09 -0000 1.5 @@ -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.1.4 +Version: 1.1.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Feb 1 2006 Chris Wright 1.1.6-1 +- git-1.1.6 + * Tue Jan 24 2006 Chris Wright 1.1.4-1 - git-1.1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 24 Jan 2006 22:44:00 -0000 1.16 +++ sources 1 Feb 2006 16:36:09 -0000 1.17 @@ -1 +1 @@ -8a3ebe9070f738f4fc502b3a9fb7f3f5 git-1.1.4.tar.gz +78a3cf399db4cdf6023647dc8a30e93b git-1.1.6.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 16:38:25 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 1 Feb 2006 11:38:25 -0500 Subject: rpms/git-core/FC-4 .cvsignore, 1.16, 1.17 git.spec, 1.4, 1.5 sources, 1.16, 1.17 Message-ID: <200602011638.k11GcwLl003264@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3243 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 24 Jan 2006 22:45:53 -0000 1.16 +++ .cvsignore 1 Feb 2006 16:38:25 -0000 1.17 @@ -1 +1 @@ -git-1.1.4.tar.gz +git-1.1.6.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- git.spec 24 Jan 2006 22:45:53 -0000 1.4 +++ git.spec 1 Feb 2006 16:38:25 -0000 1.5 @@ -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.1.4 +Version: 1.1.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Feb 1 2006 Chris Wright 1.1.6-1 +- git-1.1.6 + * Tue Jan 24 2006 Chris Wright 1.1.4-1 - git-1.1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 24 Jan 2006 22:45:53 -0000 1.16 +++ sources 1 Feb 2006 16:38:25 -0000 1.17 @@ -1 +1 @@ -8a3ebe9070f738f4fc502b3a9fb7f3f5 git-1.1.4.tar.gz +78a3cf399db4cdf6023647dc8a30e93b git-1.1.6.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 16:42:29 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 1 Feb 2006 11:42:29 -0500 Subject: rpms/git-core/FC-3 .cvsignore, 1.16, 1.17 git.spec, 1.4, 1.5 sources, 1.16, 1.17 Message-ID: <200602011643.k11Gh2t9003370@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3348 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 24 Jan 2006 22:47:36 -0000 1.16 +++ .cvsignore 1 Feb 2006 16:42:29 -0000 1.17 @@ -1 +1 @@ -git-1.1.4.tar.gz +git-1.1.6.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- git.spec 24 Jan 2006 22:47:36 -0000 1.4 +++ git.spec 1 Feb 2006 16:42:29 -0000 1.5 @@ -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.1.4 +Version: 1.1.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Feb 1 2006 Chris Wright 1.1.6-1 +- git-1.1.6 + * Tue Jan 24 2006 Chris Wright 1.1.4-1 - git-1.1.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 24 Jan 2006 22:47:36 -0000 1.16 +++ sources 1 Feb 2006 16:42:29 -0000 1.17 @@ -1 +1 @@ -8a3ebe9070f738f4fc502b3a9fb7f3f5 git-1.1.4.tar.gz +78a3cf399db4cdf6023647dc8a30e93b git-1.1.6.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 16:50:09 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 1 Feb 2006 11:50:09 -0500 Subject: rpms/fftw/FC-4 .cvsignore, 1.2, 1.3 fftw.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200602011650.k11Gof9D003463@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fftw/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3437 Modified Files: .cvsignore fftw.spec sources Log Message: Upgrade to 3.x branch of fftw. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fftw/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:17:17 -0000 1.2 +++ .cvsignore 1 Feb 2006 16:50:08 -0000 1.3 @@ -1 +1 @@ -fftw-2.1.5.tar.gz +fftw-3.1.tar.gz Index: fftw.spec =================================================================== RCS file: /cvs/extras/rpms/fftw/FC-4/fftw.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fftw.spec 23 May 2005 13:57:21 -0000 1.9 +++ fftw.spec 1 Feb 2006 16:50:08 -0000 1.10 @@ -1,23 +1,24 @@ Name: fftw -Version: 2.1.5 -Release: 8 +Version: 3.1 +Release: 1 Summary: Fast Fourier Transform library Group: System Environment/Libraries License: GPL URL: http://www.fftw.org/ -Source0: ftp://ftp.fftw.org/pub/fftw/fftw-2.1.5.tar.gz +Source0: ftp://ftp.fftw.org/pub/fftw/fftw-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info +Obsoletes: fftw3 < 3.1 +Provides: fftw3 = %{version}-%{release} %description -FFTW is a C subroutine library for computing the Discrete Fourier Transform -(DFT) in one or more dimensions, of both real and complex data, and of -arbitrary input size. We believe that FFTW, which is free software, should -become the FFT library of choice for most applications. Our benchmarks, -performed on on a variety of platforms, show that FFTW's performance is -typically superior to that of other publicly available FFT software. +FFTW is a C subroutine library for computing the Discrete Fourier +Transform (DFT) in one or more dimensions, of both real and complex +data, and of arbitrary input size. %package devel @@ -25,26 +26,22 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} + %description devel -FFTW is a C subroutine library for computing the Discrete Fourier Transform -(DFT) in one or more dimensions, of both real and complex data, and of -arbitrary input size. We believe that FFTW, which is free software, should -become the FFT library of choice for most applications. Our benchmarks, -performed on on a variety of platforms, show that FFTW's performance is -typically superior to that of other publicly available FFT software. +FFTW is a C subroutine library for computing the Discrete Fourier +Transform (DFT) in one or more dimensions, of both real and complex +data, and of arbitrary input size. This package contains header files and development libraries needed to develop programs using the FFTW fast Fourier transform library. - %prep %setup -q -c %{name}-%{version} mv %{name}-%{version} single cp -a single double - %build pushd double %ifarch i386 @@ -69,51 +66,59 @@ popd - %install rm -rf ${RPM_BUILD_ROOT} pushd double make install DESTDIR=${RPM_BUILD_ROOT} cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO ../ - cp -a FAQ/fftw-faq.html/ doc/ ../ + cp -a doc/ ../ popd pushd single make install DESTDIR=${RPM_BUILD_ROOT} popd -rm -f doc/Makefile* -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 +%post devel +/sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : + +%preun devel +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : +fi + %files %defattr(-,root,root,-) %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO +%doc %{_mandir}/man?/* +%{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) -%doc doc/ +%doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/ +%doc %{_infodir}/*.info* +%exclude %{_libdir}/*.la +%exclude %{_infodir}/dir %{_includedir}/* +%{_libdir}/pkgconfig/* %{_libdir}/*.a %{_libdir}/*.so -%{_infodir}/* - - %changelog +* Wed Feb 1 2006 Quentin Spencer 3.1-1 +- Upgrade to the 3.x branch, incorporating changes from the fftw3 spec file. + * Mon May 23 2005 Michael Schwendt - 2.1.5-8 - BuildReq gcc-gfortran (#156490). Index: sources =================================================================== RCS file: /cvs/extras/rpms/fftw/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:17:17 -0000 1.2 +++ sources 1 Feb 2006 16:50:08 -0000 1.3 @@ -1 +1 @@ -8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz +911515569a8abdc7dbb207d53f34e60b fftw-3.1.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 16:51:56 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 1 Feb 2006 11:51:56 -0500 Subject: owners owners.list,1.593,1.594 Message-ID: <200602011652.k11GqSvt003497@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3479 Modified Files: owners.list Log Message: Take over libnet10 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.593 retrieving revision 1.594 diff -u -r1.593 -r1.594 --- owners.list 1 Feb 2006 14:42:42 -0000 1.593 +++ owners.list 1 Feb 2006 16:51:56 -0000 1.594 @@ -536,7 +536,7 @@ Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org| Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|extras-orphan at fedoraproject.org|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|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Feb 1 17:00:13 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 1 Feb 2006 12:00:13 -0500 Subject: rpms/libnet10/devel libnet10.spec,1.9,1.10 Message-ID: <200602011700.k11H0jIJ003613@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnet10/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3593 Modified Files: libnet10.spec Log Message: - rebuild Index: libnet10.spec =================================================================== RCS file: /cvs/extras/rpms/libnet10/devel/libnet10.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libnet10.spec 28 Aug 2005 19:12:27 -0000 1.9 +++ libnet10.spec 1 Feb 2006 17:00:13 -0000 1.10 @@ -1,7 +1,7 @@ Summary: High-level API (toolkit) to construct and inject network packets Name: libnet10 Version: 1.0.2a -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.packetfactory.net/libnet/ License: BSD Group: System Environment/Libraries @@ -70,6 +70,9 @@ %changelog +* Wed Feb 1 2006 Patrice Dumas - 1.0.2a-9 +- rebuild + * Sun Aug 28 2005 Michael Schwendt - 1.0.2a-8 - add versioned Obsoletes/Provides for libnet and libnet-devel so libnet/libnet-devel >= 1.1.0 upgrade this and don't just conflict From fedora-extras-commits at redhat.com Wed Feb 1 17:06:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Feb 2006 12:06:19 -0500 Subject: rpms/kdesvn/FC-4 .cvsignore, 1.4, 1.5 kdesvn.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200602011706.k11H6pN9005523@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5496 Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jan 2006 16:42:54 -0000 1.4 +++ .cvsignore 1 Feb 2006 17:06:19 -0000 1.5 @@ -1 +1 @@ -kdesvn-0.7.2.tar.gz +kdesvn-0.7.3.tar.gz Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kdesvn.spec 20 Jan 2006 16:43:57 -0000 1.6 +++ kdesvn.spec 1 Feb 2006 17:06:19 -0000 1.7 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration @@ -95,6 +95,9 @@ %changelog +* Wed Feb 1 2006 - Orion Poplawski - 0.7.3-1 +- New upstream version 0.7.3 + * Fri Jan 20 2006 - Orion Poplawski - 0.7.2-1 - New upstream version 0.7.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Jan 2006 16:42:54 -0000 1.4 +++ sources 1 Feb 2006 17:06:19 -0000 1.5 @@ -1 +1 @@ -7ebc3e786bab67f23826df99a1828b08 kdesvn-0.7.2.tar.gz +db4e90a3776f9cd524e6cb432b566c73 kdesvn-0.7.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 17:12:46 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 1 Feb 2006 12:12:46 -0500 Subject: rpms/bazaar/FC-3 bazaar.spec,1.9,1.10 Message-ID: <200602011713.k11HDqDS005581@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5532/FC-3 Modified Files: bazaar.spec Log Message: Rebuild against new libneon Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/FC-3/bazaar.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bazaar.spec 14 Nov 2005 23:47:54 -0000 1.9 +++ bazaar.spec 1 Feb 2006 17:12:45 -0000 1.10 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -82,6 +82,9 @@ %{_mandir}/*/* %changelog +* Wed Feb 01 2006 Shahms E. King 1.4.2-4 +- Rebuild against new neon + * Mon Nov 14 2005 Shahms E. King 1.4.2-3 - Rebuild against new OpenSSL From fedora-extras-commits at redhat.com Wed Feb 1 17:13:22 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 1 Feb 2006 12:13:22 -0500 Subject: rpms/bazaar/devel bazaar.spec,1.10,1.11 Message-ID: <200602011713.k11HDsSS005584@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5532/devel Modified Files: bazaar.spec Log Message: Rebuild against new libneon Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/devel/bazaar.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bazaar.spec 14 Nov 2005 23:48:05 -0000 1.10 +++ bazaar.spec 1 Feb 2006 17:13:21 -0000 1.11 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -82,6 +82,9 @@ %{_mandir}/*/* %changelog +* Wed Feb 01 2006 Shahms E. King 1.4.2-4 +- Rebuild against new neon + * Mon Nov 14 2005 Shahms E. King 1.4.2-3 - Rebuild against new OpenSSL From fedora-extras-commits at redhat.com Wed Feb 1 17:12:52 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 1 Feb 2006 12:12:52 -0500 Subject: rpms/bazaar/FC-4 bazaar.spec,1.10,1.11 Message-ID: <200602011713.k11HDtcQ005587@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5532/FC-4 Modified Files: bazaar.spec Log Message: Rebuild against new libneon Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/FC-4/bazaar.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bazaar.spec 14 Nov 2005 23:47:59 -0000 1.10 +++ bazaar.spec 1 Feb 2006 17:12:52 -0000 1.11 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -82,6 +82,9 @@ %{_mandir}/*/* %changelog +* Wed Feb 01 2006 Shahms E. King 1.4.2-4 +- Rebuild against new neon + * Mon Nov 14 2005 Shahms E. King 1.4.2-3 - Rebuild against new OpenSSL From fedora-extras-commits at redhat.com Wed Feb 1 17:50:05 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 1 Feb 2006 12:50:05 -0500 Subject: rpms/liferea/devel .cvsignore, 1.19, 1.20 liferea.spec, 1.28, 1.29 sources, 1.20, 1.21 Message-ID: <200602011750.k11HobCl005953@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5928 Modified Files: .cvsignore liferea.spec sources Log Message: * Tue Jan 31 2006 Brian Pepple - 1.0.3-2 - Update to 1.0.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 25 Jan 2006 21:37:56 -0000 1.19 +++ .cvsignore 1 Feb 2006 17:50:04 -0000 1.20 @@ -1 +1 @@ -liferea-1.0.2.tar.gz +liferea-1.0.3.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- liferea.spec 25 Jan 2006 21:37:56 -0000 1.28 +++ liferea.spec 1 Feb 2006 17:50:04 -0000 1.29 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.2 +Version: 1.0.3 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -94,6 +94,9 @@ %changelog +* Tue Jan 31 2006 Brian Pepple - 1.0.3-2 +- Update to 1.0.3. + * Wed Jan 25 2006 Brian Pepple - 1.0.2-2 - Update to 1.0.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 25 Jan 2006 21:37:56 -0000 1.20 +++ sources 1 Feb 2006 17:50:04 -0000 1.21 @@ -1 +1 @@ -45cd555c60ce7f8a2eda4b776118e939 liferea-1.0.2.tar.gz +40232e6884e4ae9628916868a9a9c828 liferea-1.0.3.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 17:59:00 2006 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 1 Feb 2006 12:59:00 -0500 Subject: rpms/istanbul/devel istanbul.spec,1.4,1.5 Message-ID: <200602011759.k11HxXUB006084@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067 Modified Files: istanbul.spec Log Message: * Wed Feb 01 2006 Jef Spaleta - 0.1.1-8 - added pygtk2-devel buildrequires Index: istanbul.spec =================================================================== RCS file: /cvs/extras/rpms/istanbul/devel/istanbul.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- istanbul.spec 27 Jan 2006 23:57:39 -0000 1.4 +++ istanbul.spec 1 Feb 2006 17:59:00 -0000 1.5 @@ -8,7 +8,7 @@ Summary: Desktop Session Recorder Name: istanbul Version: 0.1.1 -Release: 7 +Release: 8 License: GPL Group: Applications/Multimedia URL: http://live.gnome.org/Istanbul @@ -22,6 +22,7 @@ Requires: gstreamer08-python BuildRequires: python, python-devel +BuildRequires: pygtk2-devel >= %{pygtk2_version} BuildRequires: desktop-file-utils BuildRequires: gstreamer08-plugins-devel >= %gstreamer_plugins_version BuildRequires: gstreamer08-python-devel, gtk2-devel @@ -92,6 +93,9 @@ %{python_sitelib}/%{name}/configure/*.py* %changelog +* Wed Feb 01 2006 Jef Spaleta - 0.1.1-8 +- added pygtk2-devel buildrequires + * Fri Jan 27 2006 Jonathan Blandford - 0.1.1-6 - change gstreamer-python to gstreamer08-python From fedora-extras-commits at redhat.com Wed Feb 1 20:06:02 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 1 Feb 2006 15:06:02 -0500 Subject: rpms/GtkAda/devel GtkAda.spec,1.10,1.11 Message-ID: <200602012006.k11K6YH4011926@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/GtkAda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11899 Modified Files: GtkAda.spec Log Message: Index: GtkAda.spec =================================================================== RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- GtkAda.spec 12 May 2005 16:56:22 -0000 1.10 +++ GtkAda.spec 1 Feb 2006 20:06:01 -0000 1.11 @@ -1,6 +1,6 @@ Name: GtkAda Version: 2.4.0 -Release: 6 +Release: 7 Summary: Ada95 graphical toolkit based on Gtk+ From fedora-extras-commits at redhat.com Wed Feb 1 20:14:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 1 Feb 2006 15:14:33 -0500 Subject: rpms/GtkAda/devel GtkAda.spec,1.11,1.12 Message-ID: <200602012015.k11KF5iC012042@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/GtkAda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12018 Modified Files: GtkAda.spec Log Message: Index: GtkAda.spec =================================================================== RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- GtkAda.spec 1 Feb 2006 20:06:01 -0000 1.11 +++ GtkAda.spec 1 Feb 2006 20:14:33 -0000 1.12 @@ -1,6 +1,6 @@ Name: GtkAda Version: 2.4.0 -Release: 7 +Release: 8 Summary: Ada95 graphical toolkit based on Gtk+ @@ -9,9 +9,17 @@ URL: http://libre.act-europe.fr/GtkAda Source: http://libre.act-europe.fr/GtkAda/GtkAda-2.4.0.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gcc-gnat, libgnat, perl, xorg-x11-devel -BuildRequires: gtk2-devel, libgnome-devel, libgnomeui-devel, bonobo-activation-devel, libbonoboui-devel, libglade2-devel -BuildRequires: texinfo, tetex-dvips +BuildRequires: gcc-gnat +BuildRequires: libgnat +BuildRequires: perl +BuildRequires: gtk2-devel +BuildRequires: libgnome-devel +BuildRequires: libgnomeui-devel +BuildRequires: bonobo-activation-devel +BuildRequires: libbonoboui-devel +BuildRequires: libglade2-devel +BuildRequires: texinfo +BuildRequires: tetex-dvips ExcludeArch: ppc ppc64 %description From fedora-extras-commits at redhat.com Wed Feb 1 20:35:14 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 1 Feb 2006 15:35:14 -0500 Subject: fedora-security/audit fc4,1.139,1.140 fc5,1.49,1.50 Message-ID: <200602012035.k11KZEhn012358@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12336 Modified Files: fc4 fc5 Log Message: Add some CVE ids. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- fc4 31 Jan 2006 08:32:59 -0000 1.139 +++ fc4 1 Feb 2006 20:35:06 -0000 1.140 @@ -3,6 +3,9 @@ ** are items that need attention +CVE-2006-0482 ** kernel +CVE-2006-0481 version (libpng, 1.2.7 only) +CVE-2006-0405 version (libtiff, 3.8.0 only) CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected CVE-2006-0301 VULNERABLE (xpdf) bz#179047 @@ -23,6 +26,10 @@ CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) CVE-2006-0035 VULNERABLE (kernel) CVE-2006-0019 backport (kdelibs) [since FEDORA-2006-050] +CVE-2005-4703 ignore (tomcat) windows only +CVE-2005-4685 VULNERABLE (mozilla) +CVE-2005-4684 VULNERABLE (kdebase) +CVE-2005-4667 VULNERABLE (unzip) bz#178961 CVE-2005-4639 VULNERABLE (kernel) CVE-2005-4636 version (openoffice.org, fixed 2.0.1) CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- fc5 31 Jan 2006 08:32:59 -0000 1.49 +++ fc5 1 Feb 2006 20:35:06 -0000 1.50 @@ -14,7 +14,9 @@ 7. Double check vulnerables and file fc5test2 bugs ** are items that need attention - +CVE-2006-0482 ** kernel +CVE-2006-0481 version (libpng, 1.2.7 only) +CVE-2006-0405 version (libtiff, 3.8.0 only) CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724:rawhide CVE-2006-0301 VULNERABLE (xpdf) bz#179423 @@ -36,6 +38,10 @@ CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916 CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916 CVE-2006-0019 VULNERABLE (kdelibs) +CVE-2005-4703 ignore (tomcat) windows only +CVE-2005-4685 VULNERABLE (mozilla) +CVE-2005-4684 VULNERABLE (kdebase) +CVE-2005-4667 VULNERABLE (unzip) bz#178961 CVE-2005-4639 version (kernel, fixed 2.6.15) CVE-2005-4636 version (openoffice.org, fixed 2.0.1) CVE-2005-4635 version (kernel, fixed 2.6.15) From fedora-extras-commits at redhat.com Wed Feb 1 20:43:25 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 1 Feb 2006 15:43:25 -0500 Subject: rpms/perl-Module-Signature/devel .cvsignore, 1.6, 1.7 perl-Module-Signature.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200602012043.k11Khw2q012441@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-serv12420 Modified Files: .cvsignore perl-Module-Signature.spec sources Log Message: * Wed Feb 1 2006 Ville Skytt?? - 0.53-1 - 0.53. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Jan 2006 18:57:38 -0000 1.6 +++ .cvsignore 1 Feb 2006 20:43:25 -0000 1.7 @@ -1 +1 @@ -Module-Signature-0.52.tar.gz +Module-Signature-0.53.tar.gz Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Module-Signature.spec 20 Jan 2006 18:57:38 -0000 1.6 +++ perl-Module-Signature.spec 1 Feb 2006 20:43:25 -0000 1.7 @@ -6,7 +6,7 @@ %define debug_package %{nil} Name: perl-Module-Signature -Version: 0.52 +Version: 0.53 Release: 1%{?dist} Summary: CPAN signature management utilities and modules @@ -66,6 +66,9 @@ %changelog +* Wed Feb 1 2006 Ville Skytt?? - 0.53-1 +- 0.53. + * Fri Jan 20 2006 Ville Skytt?? - 0.52-1 - 0.52. - Run non-live tests during build and make live ones optional, enabled Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Jan 2006 18:57:38 -0000 1.6 +++ sources 1 Feb 2006 20:43:25 -0000 1.7 @@ -1 +1 @@ -4f5ce59239561f1f0c29efb1b485744b Module-Signature-0.52.tar.gz +245d8ed867615e3f15a2a7f36b4d2f89 Module-Signature-0.53.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 20:47:36 2006 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Wed, 1 Feb 2006 15:47:36 -0500 Subject: rpms/smb4k/devel smb4k-0.6.5-buff.patch, NONE, 1.1 smb4k.spec, 1.1, 1.2 Message-ID: <200602012048.k11Km8VK012486@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/smb4k/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12466 Modified Files: smb4k.spec Added Files: smb4k-0.6.5-buff.patch Log Message: - Fix GCC warnings - Don't own KDE directories smb4k-0.6.5-buff.patch: --- NEW FILE smb4k-0.6.5-buff.patch --- diff -ur smb4k-0.6.5-orig/utilities/smb4k_umount.cpp smb4k-0.6.5/utilities/smb4k_umount.cpp --- smb4k-0.6.5-orig/utilities/smb4k_umount.cpp 2005-10-20 07:38:13.000000000 +0200 +++ smb4k-0.6.5/utilities/smb4k_umount.cpp 2006-02-01 21:39:51.000000000 +0100 @@ -321,7 +321,7 @@ bool suid_arg_exists = false; bool fs_arg_exists = false; - int pos; + int pos = 0; for ( int i = 1; i < argc; i++ ) { @@ -392,7 +392,7 @@ } else { - char *t = (char *)malloc( 250*sizeof(char) ); + char *t = (char *)malloc( 251*sizeof(char) ); if ( !t ) { Index: smb4k.spec =================================================================== RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- smb4k.spec 30 Jan 2006 23:58:16 -0000 1.1 +++ smb4k.spec 1 Feb 2006 20:47:36 -0000 1.2 @@ -1,6 +1,6 @@ Name: smb4k Version: 0.6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The SMB/CIFS Share Browser for KDE Group: Applications/Internet @@ -8,6 +8,7 @@ URL: http://smb4k.berlios.de/ Source0: http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz Patch0: smb4k-0.6.5-desktop.patch +Patch1: smb4k-0.6.5-buff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel kdebase-devel gettext @@ -30,6 +31,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -96,10 +98,10 @@ %{_libdir}/kde3/konqsidebar_smb4k.so %{_libdir}/libsmb4k*.so.* %{_datadir}/applications/*smb4k.desktop -%{_datadir}/apps/konqsidebartng/ +%{_datadir}/apps/konqsidebartng/add/smb4k*.desktop %{_datadir}/apps/smb4k/ %{_datadir}/doc/HTML/en/smb4k/ -%{_datadir}/icons/crystalsvg/* +%{_datadir}/icons/crystalsvg/*/apps/smb4k.png %files devel %defattr(-, root, root) @@ -107,6 +109,10 @@ %{_libdir}/*.so %changelog +* Wed Feb 01 2006 Marcin Garski 0.6.5-5 +- Fix GCC warnings +- Don't own KDE directories + * Wed Jan 18 2006 Marcin Garski 0.6.5-4 - Remove libxml2 from BR - Add workaround for broken libtool archive (made by Dawid Gajownik) From fedora-extras-commits at redhat.com Wed Feb 1 20:51:10 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 1 Feb 2006 15:51:10 -0500 Subject: rpms/fftw/devel .cvsignore, 1.2, 1.3 fftw.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200602012051.k11KpgKO012558@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fftw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12532 Modified Files: .cvsignore fftw.spec sources Log Message: Upgrade to 3.x branch of fftw. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fftw/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:17:17 -0000 1.2 +++ .cvsignore 1 Feb 2006 20:51:10 -0000 1.3 @@ -1 +1 @@ -fftw-2.1.5.tar.gz +fftw-3.1.tar.gz Index: fftw.spec =================================================================== RCS file: /cvs/extras/rpms/fftw/devel/fftw.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fftw.spec 23 May 2005 13:57:21 -0000 1.9 +++ fftw.spec 1 Feb 2006 20:51:10 -0000 1.10 @@ -1,23 +1,24 @@ Name: fftw -Version: 2.1.5 -Release: 8 +Version: 3.1 +Release: 1%{?dist} Summary: Fast Fourier Transform library Group: System Environment/Libraries License: GPL URL: http://www.fftw.org/ -Source0: ftp://ftp.fftw.org/pub/fftw/fftw-2.1.5.tar.gz +Source0: ftp://ftp.fftw.org/pub/fftw/fftw-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info +Obsoletes: fftw3 < 3.1 +Provides: fftw3 = %{version}-%{release} %description -FFTW is a C subroutine library for computing the Discrete Fourier Transform -(DFT) in one or more dimensions, of both real and complex data, and of -arbitrary input size. We believe that FFTW, which is free software, should -become the FFT library of choice for most applications. Our benchmarks, -performed on on a variety of platforms, show that FFTW's performance is -typically superior to that of other publicly available FFT software. +FFTW is a C subroutine library for computing the Discrete Fourier +Transform (DFT) in one or more dimensions, of both real and complex +data, and of arbitrary input size. %package devel @@ -25,26 +26,22 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} + %description devel -FFTW is a C subroutine library for computing the Discrete Fourier Transform -(DFT) in one or more dimensions, of both real and complex data, and of -arbitrary input size. We believe that FFTW, which is free software, should -become the FFT library of choice for most applications. Our benchmarks, -performed on on a variety of platforms, show that FFTW's performance is -typically superior to that of other publicly available FFT software. +FFTW is a C subroutine library for computing the Discrete Fourier +Transform (DFT) in one or more dimensions, of both real and complex +data, and of arbitrary input size. This package contains header files and development libraries needed to develop programs using the FFTW fast Fourier transform library. - %prep %setup -q -c %{name}-%{version} mv %{name}-%{version} single cp -a single double - %build pushd double %ifarch i386 @@ -69,51 +66,60 @@ popd - %install rm -rf ${RPM_BUILD_ROOT} pushd double make install DESTDIR=${RPM_BUILD_ROOT} cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO ../ - cp -a FAQ/fftw-faq.html/ doc/ ../ + cp -a doc/ ../ popd pushd single make install DESTDIR=${RPM_BUILD_ROOT} popd -rm -f doc/Makefile* -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 +%post devel +/sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : + +%preun devel +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : +fi + %files %defattr(-,root,root,-) %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO +%doc %{_mandir}/man?/* +%{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) -%doc doc/ +%doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/ +%doc %{_infodir}/*.info* +%exclude %{_libdir}/*.la +%exclude %{_infodir}/dir %{_includedir}/* +%{_libdir}/pkgconfig/* %{_libdir}/*.a %{_libdir}/*.so -%{_infodir}/* - - %changelog +* Wed Feb 1 2006 Quentin Spencer 3.1-1 +- Upgrade to the 3.x branch, incorporating changes from the fftw3 spec file. +- Add dist tag. + * Mon May 23 2005 Michael Schwendt - 2.1.5-8 - BuildReq gcc-gfortran (#156490). Index: sources =================================================================== RCS file: /cvs/extras/rpms/fftw/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:17:17 -0000 1.2 +++ sources 1 Feb 2006 20:51:10 -0000 1.3 @@ -1 +1 @@ -8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz +911515569a8abdc7dbb207d53f34e60b fftw-3.1.tar.gz From fedora-extras-commits at redhat.com Wed Feb 1 20:52:24 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 1 Feb 2006 15:52:24 -0500 Subject: rpms/fftw/devel fftw.spec,1.10,1.11 Message-ID: <200602012052.k11KquuD012584@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fftw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12564 Modified Files: fftw.spec Log Message: Remove obsoletes Index: fftw.spec =================================================================== RCS file: /cvs/extras/rpms/fftw/devel/fftw.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fftw.spec 1 Feb 2006 20:51:10 -0000 1.10 +++ fftw.spec 1 Feb 2006 20:52:23 -0000 1.11 @@ -12,8 +12,6 @@ BuildRequires: gcc-gfortran Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -Obsoletes: fftw3 < 3.1 -Provides: fftw3 = %{version}-%{release} %description FFTW is a C subroutine library for computing the Discrete Fourier From fedora-extras-commits at redhat.com Wed Feb 1 20:53:21 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 1 Feb 2006 15:53:21 -0500 Subject: rpms/fftw/FC-4 fftw.spec,1.10,1.11 Message-ID: <200602012053.k11Krrog012609@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fftw/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590 Modified Files: fftw.spec Log Message: Add dist tag. Index: fftw.spec =================================================================== RCS file: /cvs/extras/rpms/fftw/FC-4/fftw.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fftw.spec 1 Feb 2006 16:50:08 -0000 1.10 +++ fftw.spec 1 Feb 2006 20:53:21 -0000 1.11 @@ -1,6 +1,6 @@ Name: fftw Version: 3.1 -Release: 1 +Release: 1%{?dist} Summary: Fast Fourier Transform library Group: System Environment/Libraries @@ -12,8 +12,6 @@ BuildRequires: gcc-gfortran Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -Obsoletes: fftw3 < 3.1 -Provides: fftw3 = %{version}-%{release} %description FFTW is a C subroutine library for computing the Discrete Fourier @@ -118,6 +116,7 @@ %changelog * Wed Feb 1 2006 Quentin Spencer 3.1-1 - Upgrade to the 3.x branch, incorporating changes from the fftw3 spec file. +- Add dist tag. * Mon May 23 2005 Michael Schwendt - 2.1.5-8 - BuildReq gcc-gfortran (#156490). From fedora-extras-commits at redhat.com Wed Feb 1 21:42:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Feb 2006 16:42:54 -0500 Subject: rpms/libopensync-plugin-evolution2/devel libopensync-plugin-evolution2.spec, 1.3, 1.4 Message-ID: <200602012143.k11LhQRV014738@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-evolution2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14721 Modified Files: libopensync-plugin-evolution2.spec Log Message: - bump release Index: libopensync-plugin-evolution2.spec =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/libopensync-plugin-evolution2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libopensync-plugin-evolution2.spec 18 Jan 2006 13:44:43 -0000 1.3 +++ libopensync-plugin-evolution2.spec 1 Feb 2006 21:42:53 -0000 1.4 @@ -1,6 +1,6 @@ Name: libopensync-plugin-evolution2 Version: 0.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Evolution 2 plugin for libopensync Group: System Environment/Libraries @@ -58,6 +58,9 @@ %{_includedir}/opensync-1.0/opensync/evo2_sync.h %changelog +* Wed Feb 01 2006 Andreas Bierfert 0.18-5 +- bump release + * Wed Jan 18 2006 Andreas Bierfert 0.18-4 - bump release From fedora-extras-commits at redhat.com Wed Feb 1 21:58:08 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 1 Feb 2006 16:58:08 -0500 Subject: rpms/GtkAda/devel GtkAda-case-none.patch, NONE, 1.1 GtkAda.spec, 1.12, 1.13 Message-ID: <200602012158.k11Lwfcw014845@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/GtkAda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823 Modified Files: GtkAda.spec Added Files: GtkAda-case-none.patch Log Message: GtkAda-case-none.patch: --- NEW FILE GtkAda-case-none.patch --- --- GtkAda-2.4.0/src/gtkada-mdi.adb.case-none 2006-02-01 22:54:59.000000000 +0100 +++ GtkAda-2.4.0/src/gtkada-mdi.adb 2006-02-01 22:55:31.000000000 +0100 @@ -4778,6 +4778,8 @@ when Top | Bottom => Widths (Side) := 0; Heights (Side) := Get_Allocation_Height (MDI.Docks (Side)); + when None => + null; end case; -- If not allocated yet Index: GtkAda.spec =================================================================== RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- GtkAda.spec 1 Feb 2006 20:14:33 -0000 1.12 +++ GtkAda.spec 1 Feb 2006 21:58:08 -0000 1.13 @@ -1,6 +1,6 @@ Name: GtkAda Version: 2.4.0 -Release: 8 +Release: 9 Summary: Ada95 graphical toolkit based on Gtk+ @@ -8,6 +8,7 @@ License: GPL URL: http://libre.act-europe.fr/GtkAda Source: http://libre.act-europe.fr/GtkAda/GtkAda-2.4.0.tgz +Patch0: GtkAda-case-none.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat BuildRequires: libgnat @@ -39,6 +40,7 @@ %prep %setup -q +%patch0 -p1 -b .case-none %build %configure @@ -121,6 +123,9 @@ %doc known-problems %changelog +* Wed Feb 1 2006 Gerard Milmeister - 2.4.0-9 +- patch to handle all cases + * Thu May 12 2005 Thorsten Leemhuis 2.4.0-6 - Add excludearch ppc ppc64 (no gcc-gnat currently for those) #157550 From fedora-extras-commits at redhat.com Wed Feb 1 22:50:59 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 1 Feb 2006 17:50:59 -0500 Subject: rpms/tla/devel tla.spec,1.20,1.21 Message-ID: <200602012251.k11MpWPL017065@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/tla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17046 Modified Files: tla.spec Log Message: * Wed Feb 1 2006 Ville Skytt?? - 1.3.3-4 - Rebuild for new neon. Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- tla.spec 14 Dec 2005 10:00:42 -0000 1.20 +++ tla.spec 1 Feb 2006 22:50:59 -0000 1.21 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Low-Budget Arch Revision Control System Group: Development/Tools @@ -73,6 +73,9 @@ %{_mandir}/man1/tla.1* %changelog +* Wed Feb 1 2006 Ville Skytt?? - 1.3.3-4 +- Rebuild for new neon. + * Wed Dec 14 2005 Ville Skytt?? - 1.3.3-3 - Apply 1.3.3-3 patchset from Debian; includes system neon patch, adds man page and hopefully fixes ppc segfaults etc. From fedora-extras-commits at redhat.com Wed Feb 1 22:54:21 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Feb 2006 17:54:21 -0500 Subject: rpms/gv/devel gv.spec,1.4,1.5 Message-ID: <200602012254.k11MsrEc017157@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17139 Modified Files: gv.spec Log Message: Remove info dir file Index: gv.spec =================================================================== RCS file: /cvs/extras/rpms/gv/devel/gv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gv.spec 21 Dec 2005 17:12:25 -0000 1.4 +++ gv.spec 1 Feb 2006 22:54:21 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A X front-end for the Ghostscript PostScript(TM) interpreter Name: gv Version: 3.6.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Publishing Requires: ghostscript @@ -65,6 +65,9 @@ --dir %{buildroot}%{_datadir}/applications/ \ gv.desktop +# Remove info dir file +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir + %clean rm -rf $RPM_BUILD_ROOT @@ -100,6 +103,9 @@ %{_mandir}/man1/gv.* %changelog +* Wed Feb 1 2006 Orion Poplawski 3.6.1-6 +- Remove info dir file + * Wed Dec 21 2005 Orion Poplawski 3.6.1-5 - Rebuild From fedora-extras-commits at redhat.com Wed Feb 1 23:06:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 1 Feb 2006 18:06:36 -0500 Subject: rpms/GtkAda/devel GtkAda.spec,1.13,1.14 Message-ID: <200602012307.k11N7A82019358@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/GtkAda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19330 Modified Files: GtkAda.spec Log Message: Index: GtkAda.spec =================================================================== RCS file: /cvs/extras/rpms/GtkAda/devel/GtkAda.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- GtkAda.spec 1 Feb 2006 21:58:08 -0000 1.13 +++ GtkAda.spec 1 Feb 2006 23:06:36 -0000 1.14 @@ -1,6 +1,6 @@ Name: GtkAda Version: 2.4.0 -Release: 9 +Release: 10%{?dist} Summary: Ada95 graphical toolkit based on Gtk+ @@ -44,6 +44,7 @@ %build %configure +perl -pi -e 's|--param=ssp-buffer-size=4||' testgtk/Makefile ( mkdir -p src/lib-obj; cd src/lib-obj; @@ -123,6 +124,9 @@ %doc known-problems %changelog +* Thu Feb 2 2006 Gerard Milmeister - 2.4.0-10 +- remove "--param=ssp-buffer-size=4" from gnatmake command line + * Wed Feb 1 2006 Gerard Milmeister - 2.4.0-9 - patch to handle all cases From fedora-extras-commits at redhat.com Wed Feb 1 23:20:58 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Feb 2006 18:20:58 -0500 Subject: rpms/plplot/devel plplot.spec,1.7,1.8 Message-ID: <200602012321.k11NLUln019478@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19461 Modified Files: plplot.spec Log Message: Package .pyc and .pyo files Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plplot.spec 22 Dec 2005 20:18:54 -0000 1.7 +++ plplot.spec 1 Feb 2006 23:20:58 -0000 1.8 @@ -2,7 +2,7 @@ Name: plplot Version: 5.5.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -220,9 +220,15 @@ %{_libdir}/plplot%{version}/driversd/xwin.so %{python_sitelib}/_plplotcmodule.so %{python_sitelib}/plplot.py +%{python_sitelib}/plplot.pyc +%{python_sitelib}/plplot.pyo %{python_sitelib}/plplot_widgetmodule.so %{python_sitelib}/plplotc.py +%{python_sitelib}/plplotc.pyc +%{python_sitelib}/plplotc.pyo %{python_sitelib}/plplotcanvas.py +%{python_sitelib}/plplotcanvas.pyc +%{python_sitelib}/plplotcanvas.pyo %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz %{_mandir}/man1/plrender.1.gz @@ -310,6 +316,9 @@ %{_datadir}/plplot%{version}/examples/tk/ %changelog +* Wed Feb 1 2006 - Orion Poplawski - 5.5.3-11 +- Package .pyc and .pyo files + * Thu Dec 22 2005 - Orion Poplawski - 5.5.3-10 - Add patch to strip X check from configure for modular X - Rework patches to patch configure and avoid autoconf From fedora-extras-commits at redhat.com Wed Feb 1 23:43:40 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 1 Feb 2006 18:43:40 -0500 Subject: rpms/octave/devel octave.spec,1.28,1.29 Message-ID: <200602012344.k11NiCTd019759@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19738 Modified Files: octave.spec Log Message: Change fftw3 dependency to fftw. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- octave.spec 26 Jan 2006 22:49:15 -0000 1.28 +++ octave.spec 1 Feb 2006 23:43:40 -0000 1.29 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -17,7 +17,7 @@ Requires(preun): /sbin/install-info 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 fftw3-devel autoconf gperf +BuildRequires: readline-devel glibc-devel fftw-devel autoconf gperf BuildRequires: ufsparse-devel glpk-devel gnuplot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,7 +41,7 @@ Summary: Development headers and files for Octave Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: readline-devel fftw3-devel hdf5-devel zlib-devel +Requires: readline-devel fftw-devel hdf5-devel zlib-devel Requires: lapack-devel blas-devel %description devel @@ -131,6 +131,9 @@ %changelog +* Wed Feb 1 2006 Quentin Spencer 2.9.4-6 +- Change dependency from fftw3 to fftw. + * Thu Jan 26 2006 Quentin Spencer 2.9.4-5 - Rebuild for new release of hdf5. From fedora-extras-commits at redhat.com Wed Feb 1 23:47:00 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 1 Feb 2006 18:47:00 -0500 Subject: rpms/octave/FC-4 octave.spec,1.24,1.25 Message-ID: <200602012347.k11NlWC9019792@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19775 Modified Files: octave.spec Log Message: Change fftw3 dependency to fftw. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- octave.spec 29 Jan 2006 07:02:01 -0000 1.24 +++ octave.spec 1 Feb 2006 23:47:00 -0000 1.25 @@ -17,7 +17,7 @@ BuildRequires: gnuplot bison flex less tetex gcc-gfortran BuildRequires: lapack-devel blas-devel BuildRequires: ncurses-devel zlib-devel libtermcap-devel hdf5-devel -BuildRequires: readline-devel glibc-devel fftw3-devel gperf +BuildRequires: readline-devel glibc-devel fftw-devel gperf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -39,7 +39,7 @@ Summary: Development headers and files for Octave Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: readline-devel fftw3-devel hdf5-devel zlib-devel +Requires: readline-devel fftw-devel hdf5-devel zlib-devel Requires: lapack-devel blas-devel %description devel @@ -120,8 +120,9 @@ %changelog -* Sat Jan 28 2006 Quentin Spencer 2.1.72-3 +* Wed Feb 1 2006 Quentin Spencer 2.1.72-3 - Patch to fix bug #179242. +- Change dependency from fftw3 to fftw. * Thu Jan 26 2006 Quentin Spencer 2.1.72-2 - Rebuild for new release of hdf5. From fedora-extras-commits at redhat.com Thu Feb 2 00:05:57 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Wed, 1 Feb 2006 19:05:57 -0500 Subject: rpms/tog-pegasus - New directory Message-ID: <200602020005.k1205xVi021663@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/tog-pegasus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21655/tog-pegasus Log Message: Directory /cvs/extras/rpms/tog-pegasus added to the repository From fedora-extras-commits at redhat.com Thu Feb 2 00:06:09 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Wed, 1 Feb 2006 19:06:09 -0500 Subject: rpms/tog-pegasus/devel - New directory Message-ID: <200602020006.k1206BQU021678@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21655/tog-pegasus/devel Log Message: Directory /cvs/extras/rpms/tog-pegasus/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 2 00:06:23 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Wed, 1 Feb 2006 19:06:23 -0500 Subject: rpms/tog-pegasus Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602020006.k1206gcS021715@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/tog-pegasus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21701 Added Files: Makefile import.log Log Message: Setup of module tog-pegasus --- NEW FILE Makefile --- # Top level Makefile for module tog-pegasus all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 2 00:06:43 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Wed, 1 Feb 2006 19:06:43 -0500 Subject: rpms/tog-pegasus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602020006.k1206jSA021730@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21701/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tog-pegasus --- NEW 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 Feb 2 00:08:51 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Wed, 1 Feb 2006 19:08:51 -0500 Subject: rpms/tog-pegasus/devel README.RedHat.Security, NONE, 1.1 access.conf, NONE, 1.1 genSSLcerts, NONE, 1.1 pegasus-2.5-add_cmpi_provider_lib.patch, NONE, 1.1 pegasus-2.5-bz173401.patch, NONE, 1.1 pegasus-2.5-enable_cql.patch, NONE, 1.1 pegasus-2.5-local-or-remote-auth.patch, NONE, 1.1 pegasus-2.5-make_install.patch, NONE, 1.1 pegasus-2.5-redhat.patch, NONE, 1.1 rpm_build_env, NONE, 1.1 tog-pegasus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602020009.k1209O5G021879@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21820/devel Modified Files: .cvsignore sources Added Files: README.RedHat.Security access.conf genSSLcerts pegasus-2.5-add_cmpi_provider_lib.patch pegasus-2.5-bz173401.patch pegasus-2.5-enable_cql.patch pegasus-2.5-local-or-remote-auth.patch pegasus-2.5-make_install.patch pegasus-2.5-redhat.patch rpm_build_env tog-pegasus.spec Log Message: auto-import tog-pegasus-2.5-1.fe4 on branch devel from tog-pegasus-2.5-1.fe4.src.rpm --- NEW FILE README.RedHat.Security --- Red Hat Security Enhancements for tog-pegasus ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Access to the Pegasus services: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ By default, with the configuration as shipped, the upstream Open Group Pegasus release allowed any user with an account on the machine (including root) to use the network HTTPS port 5989 (by default) and HTTP port 5988 services. On authentication failures, though there was the standard PAM authentication failure delay, no messages were logged to syslog. This meant that potentially a long-running cracker process could try millions of root passwords over the network and could possibly discover the root password . If users were unwise enough to enable the HTTP service on port 5988, then root passwords could be sent unencrypted over the network. This situation was deemed unacceptable by Red Hat RHEL QA test and Security Response team engineers. So for the Red Hat tog-pegasus release, PAM access control was enabled, to remove these vulnerabilities. There is now a "pegasus" user created during install, and users are recommended to use only that user to invoke CIM operations over the network. By default: o root password authentication for CIM operations invoked over the network HTTPS/HTTP services is denied - the root user is unable to invoke pegasus services over the network - only the "pegasus" user may do so. o the root user may invoke CIM operations over the HTTPS/HTTP ports on the local machine. o any user other than "pegasus" or "root" may not invoke pegasus services over the HTTPS/HTTP ports at all. o any PAM authentication failure will be logged to syslog NOTE: after installation, you must set the password for the pegasus user - issue this command as root : # passwd pegasus - to enable CIM operation network service, if the pegasus user is a local system user. Note also that even though a non-root user's password is used to authenticate with the cimserver, the cimserver and all CIM Operation Providers run as root. This was another reason to restrict use of CIM Operations to only one user. The "pegasus" user may of course be a NIS, Kerberos, or LDAP user, which could be used as configured in /etc/nsswitch.conf or with the PAM stack. You may configure this differently, and at your own risk, by modifying the pam_access configuration file /etc/Pegasus/access.conf, or by removing the line: account required pam_access.so accessfile=/etc/Pegasus/access.conf from /etc/pam.d/wbem - then tog-pegasus' authentication behaviour would be the same as that of the upstream release. SELinux ~~~~~~~ There is an SELinux policy for tog-pegasus shipped in selinux-policy-targeted-1.17.30-2.110+ . When SELinux is enabled in enforcing mode, the cimserver and providers are restricted to the operations allowed to the 'pegasus_t' security context. Also only the pegasus_exec_t context may modify the repository, and only the pegasus_exec_conf_t context may modify the pegasus configuration files which are of pegasus_conf_t file context. ExecShield ~~~~~~~~~~ All tog-pegasus binary executables are compiled with ExecShield enabled, which make it nearly impossible to modify them or to poke executable code into them. --- NEW FILE access.conf --- ############################################################################## # Pegasus WBEM HTTP/HTTPS Network Service User Access Control Table: # # This file controls access to the Pegasus WBEM Network services by users # with the PAM pam_access module . # # The format of the access control table is three fields separated by a # ":" character: # # permission : users : origins # # The first field should be a "+" (access granted) or "-" (access denied) # character. # # The second field should be a list of one or more login names, group # names, or ALL (always matches). A pattern of the form user at host is # matched when the login name matches the "user" part, and when the # "host" part matches the local machine name. # # If you run NIS you can use @netgroupname in host or user patterns; this # even works for @usergroup@@hostgroup patterns. Weird. # # The EXCEPT operator makes it possible to write very compact rules. # # The group file is searched only when a name does not match that of the # logged-in user. Both the user's primary group is matched, as well as # groups in which users are explicitly listed. # # The third field must be 'wbemNetwork', to control access by users from # remote hosts, or 'wbemLocal', to control access by users from the local host. ############################################################################## # # Pegasus PAM Access Rules: # 1. The Remote host user access rule: # By default, ONLY the pegasus user can use remote network HTTP/S service: # -: ALL EXCEPT pegasus:wbemNetwork # # # 2. The Local host user access rule: # By default, ONLY the pegasus and root users can use pegasus local HTTP/S service: # -: ALL EXCEPT pegasus root:wbemLocal --- NEW FILE genSSLcerts --- #!/bin/bash # # Set up the openssl certificates for the tog-pegasus cimserver # # Arguments: # If a single host name argument is given that resolves to a host # IP address, then the script will attempt to copy the certificate # files from that host name. # # Without any arguments: # # Modify entries in ssl.cnf, then # Generate a self signed node certificate # PEGASUS_CONFIG_DIR=${PEGASUS_CONFIG_DIR:=/etc/Pegasus} INSTALL_LOG=${INSTALL_LOG:=/var/log/Pegasus/install.log} PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=server.pem} PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=file.pem} PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=client.pem} cnfChanged=0; if [ ! -e $PEGASUS_CONFIG_DIR/ssl.cnf ]; then mkdir -p ${INSTALL_LOG%/*} mkdir -p $PEGASUS_CONFIG_DIR echo "[ req ]" > $PEGASUS_CONFIG_DIR/ssl.cnf echo "distinguished_name = req_distinguished_name" >> $PEGASUS_CONFIG_DIR/ssl.cnf echo "prompt = no" >> $PEGASUS_CONFIG_DIR/ssl.cnf echo "[ req_distinguished_name ]" >> $PEGASUS_CONFIG_DIR/ssl.cnf echo "C = UK" >> $PEGASUS_CONFIG_DIR/ssl.cnf echo "ST = Berkshire" >> $PEGASUS_CONFIG_DIR/ssl.cnf echo "L = Reading" >> $PEGASUS_CONFIG_DIR/ssl.cnf echo "O = The Open Group" >> $PEGASUS_CONFIG_DIR/ssl.cnf echo "OU = The OpenPegasus Project" >> $PEGASUS_CONFIG_DIR/ssl.cnf DN=`hostname`; if [ -z "$DN" ] || [ "$DN" = "(none)" ]; then DN='localhost.localdomain'; fi; FQDN=`{ host -W1 $DN 2>/dev/null || echo "$DN has address "; } | grep 'has address' | head -1 | sed 's/\ .*$//'`; if [ -z "$FQDN" ] ; then FQDN="$DN"; fi; # cannot use 'hostname --fqdn' because this can hang indefinitely echo "CN = $FQDN" >> $PEGASUS_CONFIG_DIR/ssl.cnf chmod 400 $PEGASUS_CONFIG_DIR/ssl.cnf chown root $PEGASUS_CONFIG_DIR/ssl.cnf chgrp root $PEGASUS_CONFIG_DIR/ssl.cnf cnfChanged=1; fi if [ $cnfChanged -eq 1 ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_CERT_FILE ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_KEY_FILE ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_TRUSTSTORE ]; then /usr/bin/openssl req -x509 -days 3650 -newkey rsa:2048 \ -nodes -config $PEGASUS_CONFIG_DIR/ssl.cnf \ -keyout $PEGASUS_CONFIG_DIR/key.pem -out $PEGASUS_CONFIG_DIR/cert.pem 2>>$INSTALL_LOG chmod 700 $PEGASUS_CONFIG_DIR/*.pem cat $PEGASUS_CONFIG_DIR/key.pem > $PEGASUS_CONFIG_DIR/file_2048.pem chmod 400 $PEGASUS_CONFIG_DIR/file_2048.pem cat $PEGASUS_CONFIG_DIR/cert.pem > $PEGASUS_CONFIG_DIR/server_2048.pem chmod 400 $PEGASUS_CONFIG_DIR/server_2048.pem cat $PEGASUS_CONFIG_DIR/cert.pem > $PEGASUS_CONFIG_DIR/client_2048.pem chmod 400 $PEGASUS_CONFIG_DIR/client_2048.pem rm -f $PEGASUS_CONFIG_DIR/key.pem $PEGASUS_CONFIG_DIR/cert.pem cp -fp $PEGASUS_CONFIG_DIR/server_2048.pem $PEGASUS_CONFIG_DIR/$PEGASUS_SSL_CERT_FILE cp -fp $PEGASUS_CONFIG_DIR/file_2048.pem $PEGASUS_CONFIG_DIR/$PEGASUS_SSL_KEY_FILE chmod 400 $PEGASUS_CONFIG_DIR/$PEGASUS_SSL_KEY_FILE chmod 444 $PEGASUS_CONFIG_DIR/$PEGASUS_SSL_CERT_FILE cp -fp $PEGASUS_CONFIG_DIR/client_2048.pem $PEGASUS_CONFIG_DIR/$PEGASUS_SSL_TRUSTSTORE chmod 444 $PEGASUS_CONFIG_DIR/$PEGASUS_SSL_TRUSTSTORE; fi; pegasus-2.5-add_cmpi_provider_lib.patch: --- NEW FILE pegasus-2.5-add_cmpi_provider_lib.patch --- --- pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h.add_cmpi_provider_lib 2005-10-03 17:15:32.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h 2005-10-31 12:58:45.000000000 -0500 @@ -56,7 +56,7 @@ {"exportSSLTrustStore", "/etc/Pegasus/indication_trust"}, {"crlStore", "/etc/Pegasus/crl"}, {"repositoryDir", "/var/lib/Pegasus/repository"}, - {"providerDir", PEGASUS_DEST_LIB_DIR "/Pegasus/providers"}, + {"providerDir", PEGASUS_DEST_LIB_DIR "/Pegasus/providers:" PEGASUS_DEST_LIB_DIR "/cmpi" }, {"messageDir", "/usr/share/locale"}, #endif #if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB) pegasus-2.5-bz173401.patch: --- NEW FILE pegasus-2.5-bz173401.patch --- --- pegasus-2.5/src/Pegasus/Common/SSLContext.cpp.bz173401 2005-11-16 14:53:24.000000000 -0500 +++ pegasus-2.5/src/Pegasus/Common/SSLContext.cpp 2005-11-16 18:12:59.000000000 -0500 @@ -810,7 +810,8 @@ // create SSL Context Area // - if (!( sslContext = SSL_CTX_new(SSLv23_method()) )) +// if (!( sslContext = SSL_CTX_new(SSLv23_method()) )) + if (!( sslContext = SSL_CTX_new(SSLv3_method()) )) { PEG_METHOD_EXIT(); //l10n @@ -839,9 +840,9 @@ SSL_CTX_set_session_cache_mode(sslContext, SSL_SESS_CACHE_OFF); int options = SSL_OP_ALL; -#ifndef PEGASUS_ENABLE_SSLV2 //SSLv2 is disabled by default - options |= SSL_OP_NO_SSLv2; -#endif +//#ifndef PEGASUS_ENABLE_SSLV2 //SSLv2 is disabled by default +// options |= SSL_OP_NO_SSLv2; +//#endif SSL_CTX_set_options(sslContext, options); if (_verifyPeer) pegasus-2.5-enable_cql.patch: --- NEW FILE pegasus-2.5-enable_cql.patch --- --- pegasus-2.5/env_var_Linux.status.ENABLE_CQL 2005-10-31 13:05:39.000000000 -0500 +++ pegasus-2.5/env_var_Linux.status 2005-11-09 19:40:03.000000000 -0500 @@ -18,7 +18,7 @@ PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir endif -PEGASUS_DISABLE_CQL=true +PEGASUS_ENABLE_CQL=true PEGASUS_DISABLE_OBJECT_NORMALIZATION=true PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true pegasus-2.5-local-or-remote-auth.patch: --- NEW FILE pegasus-2.5-local-or-remote-auth.patch --- --- pegasus-2.5/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local_or_remote_auth 2005-08-13 20:28:32.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2005-09-28 16:18:58.000000000 -0400 @@ -364,6 +364,9 @@ } } + // Let Authenticators know whether this user is Local or Remote: + httpMessage->authInfo->setRemoteUser( httpMessage->fromRemoteHost ); + // // Handle authentication: // --- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2005-09-28 16:18:58.000000000 -0400 @@ -90,7 +90,8 @@ Boolean PAMBasicAuthenticator::authenticate( const String& userName, - const String& password) + const String& password, + Boolean isRemoteUser) { PEG_METHOD_ENTER(TRC_AUTHENTICATION, "PAMBasicAuthenticator::authenticate()"); --- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2005-09-28 16:18:58.000000000 -0400 @@ -71,7 +71,8 @@ */ Boolean authenticate( const String& userName, - const String& password); + const String& password, + Boolean isRemoteUser); /** Verify PAM account management for the requesting user. @param userName String containing the user name @@ -100,7 +101,8 @@ Boolean _authenticateByPAM( const String& userName, - const String& password); + const String& password, + Boolean isRemoteUser); void _createPAMStandalone(); @@ -156,7 +158,8 @@ */ Boolean authenticate( const String& userName, - const String& password); + const String& password, + Boolean isRemoteUser); /** Verify whether the user is valid. @param userName String containing the user name @@ -218,7 +221,8 @@ Boolean _authenticateByPAM( const String& userName, - const String& password); + const String& password, + Boolean isRemoteUser); #if defined(PEGASUS_USE_PAM_STANDALONE_PROC) PAMBasicAuthenticatorStandAlone _pamBasicAuthenticatorStandAlone; --- pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2005-09-28 16:18:58.000000000 -0400 @@ -136,7 +136,7 @@ authInfo->setAuthenticatedUser(userName); authInfo->setAuthenticatedPassword(password); #else - authenticated = _basicAuthenticator->authenticate(userName, password); + authenticated = _basicAuthenticator->authenticate(userName, password, authInfo->isRemoteUser()); if (authenticated) { --- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local_or_remote_auth 2005-07-19 15:14:48.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2005-09-28 16:47:55.000000000 -0400 @@ -129,7 +129,8 @@ Boolean PAMBasicAuthenticator::authenticate( const String& userName, - const String& password) + const String& password, + Boolean isRemoteUser) { PEG_METHOD_ENTER(TRC_AUTHENTICATION, "PAMBasicAuthenticator::authenticate()"); @@ -137,7 +138,7 @@ Boolean authenticated; #if !defined(PEGASUS_USE_PAM_STANDALONE_PROC) - authenticated = _authenticateByPAM(userName, password); + authenticated = _authenticateByPAM(userName, password, isRemoteUser); #else // // Mutex to Serialize Authentication calls. @@ -145,8 +146,9 @@ Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, "Authentication Mutex lock."); AutoMutex lock(_authSerializeMutex); - authenticated = _pamBasicAuthenticatorStandAlone.authenticate( - userName, password); + authenticated = + _pamBasicAuthenticatorStandAlone->authenticate(userName, + password); #endif PEG_METHOD_EXIT(); @@ -155,7 +157,8 @@ Boolean PAMBasicAuthenticator::_authenticateByPAM( const String& userName, - const String& password) + const String& password, + Boolean isRemoteUser) { PEG_METHOD_ENTER(TRC_AUTHENTICATION, "PAMBasicAuthenticator::_authenticateByPAM()"); @@ -165,6 +168,7 @@ pam_handle_t *phandle; char *name; APP_DATA mydata; + int retcode; // // Store the password for PAM authentication @@ -178,21 +182,38 @@ // Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, // "PAMBasicAuthenticator::_authenticateByPAM() - userName = %s; userPassword = %s", // (const char *)userName.getCString(), (const char *)password.getCString()); + + // NOTE: if any pam call should log anything, our syslog socket will be redirected + // to the AUTH facility, so we need to redirect it back after each pam call. // //Call pam_start since you need to before making any other PAM calls // - if ( ( pam_start(service, + + if ( (retcode = pam_start(service, (const char *)userName.getCString(), &pconv, &phandle) ) != PAM_SUCCESS ) { + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog( LOG_ERR, "pam_start failed: %s", pam_strerror(phandle, retcode)); PEG_METHOD_EXIT(); return (authenticated); } + + if ( (retcode = pam_set_item(phandle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS ) + { + pam_end(phandle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(phandle, retcode)); + PEG_METHOD_EXIT(); + return (authenticated); + } // //Call pam_authenticate to authenticate the user // - if ( ( pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) + if ( ( retcode = pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) { Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, "pam_authenticate successful."); @@ -201,22 +222,40 @@ //checking for password and account expiration, as well as verifying access //hour restrictions. // - if ( ( pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) + + if ( ( retcode = pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) { Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, "pam_acct_mgmt successful."); authenticated = true; - } + }else + { + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog(LOG_ERR, "pam_acct_mgmt failed: %s",pam_strerror(phandle, retcode)); + } + }else + { + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(phandle, retcode)); } - // //Call pam_end to end our PAM work // pam_end(phandle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); - PEG_METHOD_EXIT(); + if ( ! authenticated ) + syslog(LOG_ERR, "PAM authentication failed for %s user: %s", + isRemoteUser ? "remote" : "local", + (const char*)userName.getCString() + ); + PEG_METHOD_EXIT(); return (authenticated); + } Boolean PAMBasicAuthenticator::validateUser(const String& userName) @@ -231,6 +270,7 @@ pam_handle_t *phandle; char *name; APP_DATA mydata; + int retcode; const char *service = "wbem"; pconv.conv = PAMBasicAuthenticator::pamValidateUserCallback; @@ -239,21 +279,43 @@ // // Call pam_start since you need to before making any other PAM calls // - if ( pam_start(service, - (const char *)userName.getCString(), &pconv, &phandle) != PAM_SUCCESS) - { + if ( (retcode = + pam_start(service,(const char *)userName.getCString(), &pconv, &phandle) + ) != PAM_SUCCESS + ) + { + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog( LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, retcode)); PEG_METHOD_EXIT(); return (authenticated); } + if ( (retcode = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS ) + { + pam_end(phandle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, retcode)); + PEG_METHOD_EXIT(); + return (authenticated); + } // // Call pam_acct_mgmt, to check if the user account is valid. This includes // checking for account expiration, as well as verifying access // hour restrictions. // - if ( pam_acct_mgmt(phandle, 0) == PAM_SUCCESS ) - { + if ( (retcode = pam_acct_mgmt(phandle, 0)) == PAM_SUCCESS ) + { authenticated = true; + }else + { + pam_end(phandle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog( LOG_ERR, "pam_acct_mgmt() failed: %s", pam_strerror(phandle, retcode)); + PEG_METHOD_EXIT(); + return (authenticated); } // @@ -261,6 +323,9 @@ // pam_end(phandle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + #else // // Mutex to Serialize Authentication calls. --- pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2005-09-28 16:18:58.000000000 -0400 @@ -65,7 +65,8 @@ */ virtual Boolean authenticate( const String& userName, - const String& password) = 0; + const String& password, + Boolean isRemoteUser) = 0; /** Construct and return the HTTP Basic authentication challenge header @return A string containing the authentication challenge header. --- pegasus-2.5/src/Pegasus/Common/HTTPMessage.cpp.local_or_remote_auth 2005-05-31 21:51:53.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/HTTPMessage.cpp 2005-09-28 16:18:58.000000000 -0400 @@ -101,7 +101,8 @@ message(message_), queueId(queueId_), acceptLanguagesDecoded(false), - contentLanguagesDecoded(false) + contentLanguagesDecoded(false), + fromRemoteHost(true) { if (cimException_) cimException = *cimException_; --- pegasus-2.5/src/Pegasus/Common/HTTPMessage.h.local_or_remote_auth 2005-05-12 02:59:56.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/HTTPMessage.h 2005-09-28 16:18:58.000000000 -0400 @@ -77,7 +77,8 @@ ContentLanguages contentLanguages; Boolean acceptLanguagesDecoded; Boolean contentLanguagesDecoded; - CIMException cimException; + Boolean fromRemoteHost; + CIMException cimException; void parse( String& startLine, --- pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.cpp.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500 +++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.cpp 2005-09-28 16:18:58.000000000 -0400 @@ -55,7 +55,8 @@ _privileged(false), _authType(String::EMPTY), _authStatus(NEW_REQUEST), - _exportConnection(false) + _exportConnection(false), + _remoteUser(true) { PEG_METHOD_ENTER( TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep"); @@ -178,5 +179,14 @@ PEG_METHOD_EXIT(); } +void AuthenticationInfoRep::setRemoteUser(Boolean remoteUser) +{ + PEG_METHOD_ENTER(TRC_AUTHENTICATION, + "AuthenticationInfoRep::setRemoteUser"); + + _remoteUser = remoteUser; + + PEG_METHOD_EXIT(); +} PEGASUS_NAMESPACE_END --- pegasus-2.5/src/Pegasus/Common/AuthenticationInfo.h.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500 +++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfo.h 2005-09-28 16:18:58.000000000 -0400 @@ -329,6 +329,22 @@ _rep->setClientCertificate(clientCertificate); } + /** Indicate whether the user is Remote + */ + Boolean isRemoteUser() const + { + _checkRep(); + return _rep->isRemoteUser(); + } + + /** Set the Remote User flag + */ + void setRemoteUser(Boolean remoteUser) + { + _checkRep(); + _rep->setRemoteUser(remoteUser); + } + private: AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep) --- pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.h.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500 +++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.h 2005-09-28 16:18:58.000000000 -0400 @@ -140,6 +140,14 @@ void setExportConnection(Boolean exportConnection); + Boolean isRemoteUser() const + { + return _remoteUser; + } + + void setRemoteUser(Boolean remoteUser); + + //PEP187 SSLCertificateInfo* getClientCertificate() { @@ -170,7 +178,8 @@ #endif Boolean _exportConnection; - SSLCertificateInfo* _clientCertificate; + SSLCertificateInfo* _clientCertificate; + Boolean _remoteUser; }; PEGASUS_NAMESPACE_END --- pegasus-2.5/src/Pegasus/Common/HTTPConnection.cpp.local_or_remote_auth 2005-08-18 20:24:32.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/HTTPConnection.cpp 2005-09-28 16:18:58.000000000 -0400 @@ -1807,6 +1807,30 @@ "_requestCount = %d", _requestCount.value()); message->dest = _outputMessageQueue->getQueueId(); // SendForget(message); + + // Allow authenticators to differentiate Remote and Local users: + struct sockaddr_in sin_peer, sin_svr; // don't need to worry about IPv6 yet ... + socklen_t slen1=sizeof(struct sockaddr_in), slen2=sizeof(struct sockaddr_in); + uint32_t sock = _socket.get()->getSocket() ; + memset(&sin_peer,'\0',slen1); + memset(&sin_svr, '\0',slen2); + if ( ( ::getpeername( sock, (struct sockaddr*)&sin_peer, &slen1) == 0 ) + ||( ::getsockname( sock, (struct sockaddr*)&sin_svr, &slen2) == 0 ) + ) + { + if( sin_peer.sin_family == AF_INET ) + { + if( ((ntohl( sin_peer.sin_addr.s_addr ) >> 24) & 0xff) == 127 ) + // message was sent FROM localhost interface + message->fromRemoteHost = false; + } + if( sin_svr.sin_family == AF_INET ) + { + if( ((ntohl( sin_svr.sin_addr.s_addr ) >> 24) & 0xff) == 127 ) + // message was sent TO localhost interface + message->fromRemoteHost = false; + } + } // // Set the entry status to BUSY. pegasus-2.5-make_install.patch: --- NEW FILE pegasus-2.5-make_install.patch --- --- pegasus-2.5/Makefile.make_install 2005-05-12 11:27:24.000000000 -0400 +++ pegasus-2.5/Makefile 2005-10-03 13:07:31.000000000 -0400 @@ -60,12 +60,44 @@ world: depend all repository @ $(MAKE) -s tests +install: all repository repository_install sdk_install install_dirs install_scripts + +sdk_install: +ifdef PEGASUS_INSTALL + if [ -d $(PEGASUS_SDK_STAGING_DIR) ]; then \ + ( cd $(PEGASUS_SDK_STAGING_DIR); tar -cpf - .) | ( cd $(PEGASUS_DESTDIR); tar -xpf -); \ + fi; +endif + +install_dirs: +ifdef PEGASUS_INSTALL + mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_LOG_DIR) + mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_VARRUN_DIR) + mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_LOCAL_AUTH_DIR) +endif + +install_scripts: +ifdef PEGASUS_INSTALL + mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR) + echo "#!/bin/bash" > $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository + echo "PEGASUS_MOF_DIR="$(PEGASUS_MOF_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository + echo "PEGASUS_REPOSITORY_DIR="$(PEGASUS_REPOSITORY_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository + echo "PEGASUS_BIN_DIR="$(PEGASUS_BIN_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository + echo "PEGASUS_CIM_SCHEMA=29" >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository + cat installs/scripts/init_repository >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository + chown root:root $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository >/dev/null 2>&1 || :; + chmod 0755 $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository +endif + # The repository Target removes and rebuilds the CIM repository # Note: Arguments must be quoted to preserve upper case characters in VMS. repository: FORCE @ $(MAKE) "-SC" Schemas/Pegasus repository +repository_install: repository + @ $(MAKE) "-SC" Schemas/Pegasus install_repository + repositoryclean: FORCE @ $(RMREPOSITORY) $(REPOSITORY_ROOT) --- pegasus-2.5/mak/SDKMakefile.make_install 2005-10-03 12:32:47.000000000 -0400 +++ pegasus-2.5/mak/SDKMakefile 2005-10-03 12:32:47.000000000 -0400 @@ -156,8 +156,7 @@ Providers/Load \ mak -DOCSRCPATH1FILES = \ - SecurityGuidelinesForDevelopers.html +DOCSRCPATH1FILES = CLIENTSRCPATH1FILES = \ Makefile \ @@ -402,3 +401,8 @@ testSDK: @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile tests \ PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) + +install: +ifdef PEGASUS_INSTALL + (cd $(PEGASUS_STAGING_DIR); tar -cpf - .) | ( cd $(PEGASUS_DESTDIR)/; tar -xpf -) +endif \ No newline at end of file --- pegasus-2.5/mak/program-unix.mak.make_install 2005-10-03 12:32:47.000000000 -0400 +++ pegasus-2.5/mak/program-unix.mak 2005-10-03 12:32:47.000000000 -0400 @@ -154,4 +154,4 @@ include $(ROOT)/mak/misc.mak -include $(ROOT)/mak/install-program-unix.mak +include $(PEGASUS_ROOT)/mak/install-program-unix.mak --- /dev/null 2005-10-03 10:53:34.123398250 -0400 +++ pegasus-2.5/mak/install-program-unix.mak 2005-10-03 12:32:47.000000000 -0400 @@ -0,0 +1,16 @@ +INSTALL_BIN?=bin +INSTALL_USER?=root +INSTALL_GROUP?=root +INSTALL_MODE?=0755 +install: $(PEGASUS_HOME)/bin/$(PROGRAM) +ifdef PEGASUS_INSTALL + ifndef TEST + $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/bin/$(PROGRAM) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_BIN)/$(PROGRAM) + else + ifeq ( $(TEST), 'INSTALL' ) + $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_TEST_STAGING_DIR)/$(PEGASUS_TEST_BIN_DIR)/$(PROGRAM) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_BIN)/$(PROGRAM) + endif + endif +endif + + --- /dev/null 2005-10-03 10:53:34.123398250 -0400 +++ pegasus-2.5/mak/install-library-unix.mak 2005-10-03 12:32:47.000000000 -0400 @@ -0,0 +1,16 @@ +INSTALL_LIB?=$(PEGASUS_ARCH_LIB_DIR) +INSTALL_USER?=root +INSTALL_GROUP?=root +INSTALL_MODE?=0755 +install: $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) +ifdef PEGASUS_INSTALL + ifndef TEST + $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_LIB)/lib$(LIBRARY)$(LIB_SUFFIX) + ln -s lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_LIB)/lib$(LIBRARY).so + else + ifeq ( $(TEST), 'INSTALL' ) + echo 'TEST is '"'"$(TEST)"'" + $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_TEST_STAGING_DIR)/$(PEGASUS_TEST_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) + endif + endif +endif --- pegasus-2.5/mak/library-unix.mak.make_install 2005-10-03 12:32:47.000000000 -0400 +++ pegasus-2.5/mak/library-unix.mak 2005-10-03 12:32:47.000000000 -0400 @@ -165,4 +165,4 @@ FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB) -include $(ROOT)/mak/install-library-unix.mak +include $(PEGASUS_ROOT)/mak/install-library-unix.mak --- pegasus-2.5/mak/recurse.mak.make_install 2005-05-12 11:27:28.000000000 -0400 +++ pegasus-2.5/mak/recurse.mak 2005-10-03 12:32:47.000000000 -0400 @@ -76,3 +76,5 @@ messages: $(RECURSE_DEPENDS) $(ERROR) @ $(foreach i, $(DIRS), $(MAKESH) $(MAKE) "-SC" $(i) messages $(NL) ) +install: $(RECURSE_DEPENDS) $(ERROR) + @ $(foreach i, $(DIRS), $(MAKESH) $(MAKE) "-SC" $(i) install $(NL) ) --- pegasus-2.5/rpm/Makefile.make_install 2005-05-12 11:27:29.000000000 -0400 +++ pegasus-2.5/rpm/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -51,3 +51,13 @@ messages: +install: tog-pegasus.rc wbem cimserver_planned.conf +ifdef PEGASUS_INSTALL + $(PEGASUS_INSTALL) -D -o root -g root -m 0550 tog-pegasus.rc $(PEGASUS_DESTDIR)/etc/rc.d/init.d/tog-pegasus + $(PEGASUS_INSTALL) -D -o root -g root -m 0660 cimserver_planned.conf $(PEGASUS_DESTDIR)/$(PEGASUS_CONFIG_DIR)/cimserver_planned.conf + $(PEGASUS_INSTALL) -D -o root -g root -m 0660 wbem $(PEGASUS_DESTDIR)/etc/pam.d/wbem + mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR) $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR) + cp -fp manLinux/man1.Z/*.1 $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR)/ + cp -fp manLinux/man8.Z/*.8 $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/ + for f in manLinux/man1m.Z/*.1m; do F=$(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/`echo $$f | sed 's/1m$$/8/;s/.*\///g'`; if [ ! -f $$F ]; then cp -fp $$f $$F; fi; done +endif \ No newline at end of file --- pegasus-2.5/test/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400 +++ pegasus-2.5/test/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -27,11 +27,13 @@ #// #//============================================================================== ROOT = .. - +TEST = true +TEST=true include $(ROOT)/mak/config.mak DIRS = \ wetest +TEST=true include $(ROOT)/mak/recurse.mak --- pegasus-2.5/test/TestProviders/ExceptionsTest/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400 +++ pegasus-2.5/test/TestProviders/ExceptionsTest/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -59,7 +59,9 @@ ROOT = $(PEGASUS_ROOT) +TEST=true include $(ROOT)/mak/config.mak +TEST=true include $(ROOT)/mak/configschema.mak SAMPLEPROVIDERNS= root/SampleProvider @@ -77,6 +79,7 @@ LOCAL_DEFINES=-DTEST_EXCEPTIONS +TEST=true include $(PEGASUS_ROOT)/mak/library.mak client: --- pegasus-2.5/test/TestProviders/CIMOMSample/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400 +++ pegasus-2.5/test/TestProviders/CIMOMSample/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -61,7 +61,9 @@ ROOT = $(PEGASUS_ROOT) +TEST=true include $(ROOT)/mak/config.mak +TEST=true include $(ROOT)/mak/configschema.mak SAMPLEPROVIDERNS= root/SampleProvider @@ -77,6 +79,7 @@ CIMOMSampleProvider.cpp \ [...7031 lines suppressed...] @@ -702,3 +703,4 @@ prepend-license: +install: \ No newline at end of file --- pegasus-2.5/src/Clients/MCCATestClient/Makefile.make_install 2005-05-12 11:27:35.000000000 -0400 +++ pegasus-2.5/src/Clients/MCCATestClient/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -27,13 +27,16 @@ #// #//============================================================================== ROOT = $(PEGASUS_ROOT) - +TEST = true +TEST=true include $(ROOT)/mak/config.mak +TEST=true include $(ROOT)/mak/configschema.mak PEGASUS_ZOS_PROGRAM_OBJECT = yes DIR = Clients/MCCATestClient +TEST=true include $(ROOT)/mak/config.mak ifdef PEGASUS_HAS_SSL @@ -57,6 +60,7 @@ endif endif +TEST=true include $(ROOT)/mak/program.mak tests: --- pegasus-2.5/InterfaceArchive/v002001/tests/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 +++ pegasus-2.5/InterfaceArchive/v002001/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -1,9 +1,11 @@ ROOT = $(PEGASUS_ROOT) +TEST=true include $(ROOT)/mak/config.mak DIRS = \ Providers \ Clients +TEST=true include $(ROOT)/mak/recurse.mak --- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 +++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -2,7 +2,9 @@ DIR = InterfaceArchive/$(VERSION)/tests/Providers/InstanceProvider +TEST=true include ../../../version.mak +TEST=true include $(ROOT)/mak/config.mak LIBRARY = SampleInstanceProvider @@ -14,6 +16,7 @@ InstanceProviderMain.cpp \ InstanceProvider.cpp +TEST=true include $(ROOT)/mak/library.mak ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY --- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/Makefile.make_install 2003-10-07 03:46:28.000000000 -0400 +++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -1,7 +1,9 @@ +TEST=true include $(PEGASUS_ROOT)/mak/config.mak DIRS = \ InstanceProvider \ MethodProvider +TEST=true include $(PEGASUS_ROOT)/mak/recurse.mak --- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 +++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -2,7 +2,9 @@ DIR = InterfaceArchive/$(VERSION)/tests/Providers/MethodProvider +TEST=true include ../../../version.mak +TEST=true include $(ROOT)/mak/config.mak LIBRARY = SampleMethodProvider @@ -14,6 +16,7 @@ MethodProviderMain.cpp \ MethodProvider.cpp +TEST=true include $(ROOT)/mak/library.mak ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY --- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 +++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -1,9 +1,11 @@ ROOT = $(PEGASUS_ROOT) +TEST=true include $(ROOT)/mak/config.mak DIRS = \ EnumInstances \ InvokeMethod +TEST=true include $(ROOT)/mak/recurse.mak --- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 +++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -4,8 +4,11 @@ DIR = InterfaceArchive/$(VERSION)/tests/Clients/EnumInstances +TEST=true include ../../../version.mak +TEST=true include $(ROOT)/mak/config.mak +TEST=true include ../libraries.mak EXTRA_INCLUDES = @@ -13,6 +16,7 @@ PROGRAM = EnumInstances SOURCES = EnumInstances.cpp +TEST=true include $(ROOT)/mak/program.mak ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY --- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 +++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -4,8 +4,11 @@ DIR = InterfaceArchive/$(VERSION)/tests/Clients/InvokeMethod +TEST=true include ../../../version.mak +TEST=true include $(ROOT)/mak/config.mak +TEST=true include ../libraries.mak EXTRA_INCLUDES = @@ -13,6 +16,7 @@ PROGRAM = InvokeMethod SOURCES = InvokeMethod.cpp +TEST=true include $(ROOT)/mak/program.mak ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY --- pegasus-2.5/Schemas/Pegasus/Makefile.make_install 2005-05-12 11:27:26.000000000 -0400 +++ pegasus-2.5/Schemas/Pegasus/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -68,3 +68,19 @@ xml: $(MAKE) -f $(ROOT)/Schemas/Makefile xml + +install_repository: $(PEGASUS_HOME)/repository +ifdef PEGASUS_INSTALL + mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_REPOSITORY_DIR) + cp -rfp $(PEGASUS_HOME)/repository/* $(PEGASUS_DESTDIR)/$(PEGASUS_REPOSITORY_DIR) +endif + +install: +ifdef PEGASUS_INSTALL + ifdef PEGASUS_MOF_DIR + mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus + /bin/cp -fp Internal/VER20/* InterOp/VER20/* ManagedSystem/VER20/* $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus + chmod 444 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus/* + chown -R root:root $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus >/dev/null 2>&1 || :; + endif +endif --- pegasus-2.5/Schemas/Makefile.make_install 2005-05-12 11:27:25.000000000 -0400 +++ pegasus-2.5/Schemas/Makefile 2005-10-03 12:32:47.000000000 -0400 @@ -92,3 +92,16 @@ @ $(ECHO) +++++ Creating XML for CIM Schema$(CIM_SCHEMA_VER).mof in file $(TMP_DIR)/CIM_Schema$(CIM_SCHEMA_VER).xml $(CIMMOFCLI) "-R$(TMP_DIR)" --xml "-I$(CIM_SCHEMA_DIR)" -nxml/cimv2 $(CIM_SCHEMA_DIR)/CIM_Schema$(CIM_SCHEMA_VER).mof > $(TMP_DIR)/CIM_Schema$(CIM_SCHEMA_VER).xml @ $(RMREPOSITORY) $(TMP_DIR)/repository + +install: +ifdef PEGASUS_INSTALL + ifdef PEGASUS_MOF_DIR + mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR) + cp -rfp CIM* $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/ + chown -R root:root $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/* >/dev/null 2>&1 || :; + chmod 0444 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/CIM*/* >/dev/null 2>&1 || :; + chmod 0755 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/CIM* || :; + make -SC Pegasus install + endif +endif + pegasus-2.5-redhat.patch: --- NEW FILE pegasus-2.5-redhat.patch --- --- pegasus-2.5/Makefile.ReleaseTest.redhat 2005-05-27 13:29:01.000000000 -0400 +++ pegasus-2.5/Makefile.ReleaseTest 2005-10-03 17:12:17.000000000 -0400 @@ -54,7 +54,7 @@ endif TEST_BIN_FILES_SRCPATH = $(PEGASUS_HOME)/bin -TEST_LIB_FILES_SRCPATH = $(PEGASUS_HOME)/lib +TEST_LIB_FILES_SRCPATH = $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) TEST_MAK_FILES_SRCPATH = $(ROOT)/mak MAK_FILES = \ @@ -121,7 +121,7 @@ stageTEST: @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR) @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin - @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib + @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR) @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_makfiles @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_testproviderfiles @@ -134,7 +134,7 @@ @$(foreach i, $(MAK_FILES), $(COPY) $(TEST_MAK_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak/$(i);) stage_testproviderfiles: - @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(COPY) $(TEST_LIB_FILES_SRCPATH)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);) + @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(COPY) $(TEST_LIB_FILES_SRCPATH)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX);) stage_prestarttests: @$(foreach i, $(PRESTARTTEST_FILES), $(COPY) $(TEST_BIN_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin/$(i);) @@ -157,7 +157,7 @@ createMakefile_providerlinks: @$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile - @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;) + @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;) @$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(ECHO-E) "remove_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\trm -f $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;) @@ -234,7 +234,7 @@ @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s preinstall_setreleasepermissions preinstall_setreleasepermissions: - @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.ReleaseTest setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);) + @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.ReleaseTest setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX);) _append_preunSectionToSpecFile: @$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH) @@ -253,13 +253,13 @@ @$(ECHO-E) "# Test Files" >> $(PEGASUS_RPM_SPEC_FILE_PATH) @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH) @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH) - @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/lib" >> $(PEGASUS_RPM_SPEC_FILE_PATH) + @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH) @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin" >> $(PEGASUS_RPM_SPEC_FILE_PATH) @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak" >> $(PEGASUS_RPM_SPEC_FILE_PATH) @$(foreach i, $(MAK_FILES), $(ECHO-E) \ "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);) @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) \ - "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);) + "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);) @$(foreach i, $(PRESTARTTEST_FILES), $(ECHO-E) \ "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);) @$(foreach i, $(POSTSTARTTEST_FILES), $(ECHO-E) \ --- pegasus-2.5/Makefile.Release.redhat 2005-08-17 17:00:43.000000000 -0400 +++ pegasus-2.5/Makefile.Release 2005-10-03 17:12:17.000000000 -0400 @@ -481,13 +481,13 @@ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR) stage_PegasusLibraryDirectoryFiles: FORCE - $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);) + $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);) $(foreach i, $(PEGASUS_LIBRARY_LINKS), $(MAKE) -f $(ROOT)/Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);) setpermissions_PegasusLibraryDirectoryFiles: FORCE $(foreach i, $(PEGASUS_LIBRARIES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);) stage_PegasusProviderLibraryDirectoryFiles: FORCE - $(foreach i, $(PEGASUS_PROVIDERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);) + $(foreach i, $(PEGASUS_PROVIDERS), $(COPY) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);) $(foreach i, $(PEGASUS_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);) setpermissions_PegasusProviderLibraryDirectoryFiles: FORCE --- pegasus-2.5/env_var_Linux.status.redhat 2005-09-02 14:40:58.000000000 -0400 +++ pegasus-2.5/env_var_Linux.status 2005-10-03 17:12:17.000000000 -0400 @@ -9,6 +9,7 @@ PEGASUS_OVERRIDE_PRODUCT_ID=yes PEGASUS_PRODUCT_NAME="OpenPegasus" PEGASUS_PRODUCT_VERSION="2.5.0" +PEGASUS_RPM_VERSION="2.5" PEGASUS_PRODUCT_STATUS="" PAM_CONFIG_DIR=/etc/pam.d @@ -25,32 +26,31 @@ PEGASUS_HAS_SSL=yes PEGASUS_NOASSERTS=yes PEGASUS_PAM_AUTHENTICATION=true -PEGASUS_USE_PAM_STANDALONE_PROC=true PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true PEGASUS_USE_RELEASE_DIRS=true PEGASUS_USE_SYSLOGS=true PEGASUS_CIM_SCHEMA=CIM29 -PEGASUS_PROD_DIR = /opt/tog-pegasus -PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share -PEGASUS_DOC_DIR = $(PEGASUS_PRODSHARE_DIR)/doc -PEGASUS_MAN_DIR = $(PEGASUS_PRODSHARE_DIR)/man +PEGASUS_PROD_DIR = /usr +PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share/Pegasus +PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-$(PEGASUS_RPM_VERSION) +PEGASUS_MAN_DIR = /usr/share/man PEGASUS_MANUSER_DIR = $(PEGASUS_MAN_DIR)/man1 PEGASUS_MANADMIN_DIR = $(PEGASUS_MAN_DIR)/man8 -PEGASUS_MOF_DIR = $(PEGASUS_PROD_DIR)/mof -PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/lib -PEGASUS_PROVIDER_DIR = $(PEGASUS_PROD_DIR)/providers -PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)/lib +PEGASUS_MOF_DIR = $(PEGASUS_PRODSHARE_DIR)/mof +PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/$(PEGASUS_ARCH_LIB_DIR) +PEGASUS_PROVIDER_DIR = $(PEGASUS_DEST_LIB_DIR)/Pegasus/providers +PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR) PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin PEGASUS_BIN_DIR = $(PEGASUS_PROD_DIR)/bin -PEGASUS_VARDATA_DIR = /var/opt/tog-pegasus +PEGASUS_VARDATA_DIR = /var/lib/Pegasus PEGASUS_REPOSITORY_PARENT_DIR = $(PEGASUS_VARDATA_DIR) PEGASUS_REPOSITORY_DIR = $(PEGASUS_REPOSITORY_PARENT_DIR)/repository PEGASUS_PREV_REPOSITORY_DIR = $(PEGASUS_REPOSITORY_PARENT_DIR)/prev_repository -PEGASUS_CONFIG_DIR = /etc/opt/tog-pegasus +PEGASUS_CONFIG_DIR = /etc/Pegasus PEGASUS_VARRUN_DIR = /var/run/tog-pegasus PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid -PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket +PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR) PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket PEGASUS_VARDATA_CACHE_DIR = $(PEGASUS_VARDATA_DIR)/cache PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth @@ -63,11 +63,11 @@ PEGASUS_SSL_CERT_FILE = server.pem PEGASUS_SSL_TRUSTSTORE = client.pem -PEGASUS_SAMPLES_DIR = $(PEGASUS_PROD_DIR)/samples +PEGASUS_SAMPLES_DIR = $(PEGASUS_PRODSHARE_DIR)/samples PEGASUS_INCLUDE_DIR = $(PEGASUS_PROD_DIR)/include -PEGASUS_HTML_DIR = $(PEGASUS_PROD_DIR)/html +PEGASUS_HTML_DIR = $(PEGASUS_PRODSHARE_DIR)/html -PEGASUS_TEST_DIR = $(PEGASUS_PROD_DIR)/test +PEGASUS_TEST_DIR = $(PEGASUS_PRODSHARE_DIR)/test PEGASUS_TEST_REPOSITORY_DIR = $(PEGASUS_VARDATA_DIR) PEGASUS_TEST_REPOSITORY_NAME = testrepository --- pegasus-2.5/mak/objects-unix.mak.redhat 2005-05-12 11:27:28.000000000 -0400 +++ pegasus-2.5/mak/objects-unix.mak 2005-10-03 17:12:17.000000000 -0400 @@ -50,12 +50,12 @@ ifeq ($(_NO_TMP_O), yes) $(OBJ_DIR)/%.o: %.cpp $(ERROR) - $(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp + $(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(INCLUDES) $(SYS_INCLUDES) $*.cpp @ $(TOUCH) $@ @ $(ECHO) else $(OBJ_DIR)/%.o: %.cpp $(ERROR) - $(CXX) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp + $(CXX) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(INCLUDES) $(SYS_INCLUDES) $*.cpp @ $(COPY) $(_TMP_O) $@ @ $(RM) $(_TMP_O) @ $(TOUCH) $@ @@ -64,12 +64,12 @@ ifeq ($(_NO_TMP_O), yes) $(OBJ_DIR)/%.o: %.c $(ERROR) - $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c + $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(INCLUDES) $(SYS_INCLUDES) $*.c @ $(TOUCH) $@ @ $(ECHO) else $(OBJ_DIR)/%.o: %.c $(ERROR) - $(CC) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c + $(CC) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(INCLUDES) $(SYS_INCLUDES) $*.c @ $(COPY) $(_TMP_O) $@ @ $(RM) $(_TMP_O) @ $(TOUCH) $@ --- pegasus-2.5/mak/config-linux.mak.redhat 2005-05-12 11:27:28.000000000 -0400 +++ pegasus-2.5/mak/config-linux.mak 2005-10-03 17:12:17.000000000 -0400 @@ -76,10 +76,12 @@ SYS_LIBS = -ldl -lpthread +PEGASUS_INSTALL = /usr/bin/install + # Build using fixed release settings # ifdef PEGASUS_USE_RELEASE_DIRS - PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib + PEGASUS_DEST_LIB_DIR=/usr/$(PEGASUS_ARCH_LIB_DIR) endif # PAM support @@ -102,7 +104,7 @@ ifdef PEGASUS_DEBUG FLAGS += -g -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT else -FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s -fno-enforce-eh-specs +FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -fno-enforce-eh-specs ifdef PEGASUS_OPTIMIZE_FOR_SIZE FLAGS += -Os else @@ -152,7 +154,7 @@ SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n DEFINES += -DPEGASUS_HAS_ICU - EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata + EXTRA_LIBRARIES += -L$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -licuuc -licui18n -licudata endif endif --- pegasus-2.5/mak/SDKMakefile.redhat 2005-07-15 15:46:17.000000000 -0400 +++ pegasus-2.5/mak/SDKMakefile 2005-10-03 17:12:17.000000000 -0400 @@ -382,10 +382,10 @@ @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i deregisterproviders @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile clean \ PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \ - PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib + PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile all \ - PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_INCLUDE_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR) \ - PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \ + PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) PEGASUS_INCLUDE_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR) \ + PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \ PEGASUS_INDICATION_CONSUMER_LOG_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/SimpleDisplayConsumer @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load -f Makefile createrepository \ PEGASUS_MOF_DIR=$(PEGASUS_ROOT)/Schemas PEGASUS_BIN_DIR=$(PEGASUS_HOME)bin --- pegasus-2.5/mak/config.mak.redhat 2005-08-12 13:52:31.000000000 -0400 +++ pegasus-2.5/mak/config.mak 2005-10-03 17:12:17.000000000 -0400 @@ -85,7 +85,7 @@ OBJ_DIR = $(HOME_DIR)/obj/$(DIR) BIN_DIR = $(HOME_DIR)/bin -LIB_DIR = $(HOME_DIR)/lib +LIB_DIR = $(HOME_DIR)/$(PEGASUS_ARCH_LIB_DIR) # l10n # define the location for the compiled messages @@ -544,7 +544,7 @@ # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib ifndef PEGASUS_DEST_LIB_DIR - PEGASUS_DEST_LIB_DIR = lib + PEGASUS_DEST_LIB_DIR = $(PEGASUS_ARCH_LIB_DIR) endif ifeq ($(OS),VMS) --- pegasus-2.5/mak/program-unix.mak.redhat 2005-05-12 11:27:28.000000000 -0400 +++ pegasus-2.5/mak/program-unix.mak 2005-10-03 17:14:17.000000000 -0400 @@ -28,6 +28,12 @@ #//============================================================================== INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES) +ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU + ifdef PEGASUS_EXE_LINK_FLAGS + EXTRA_LINK_FLAGS += $(PEGASUS_EXE_LINK_FLAGS) + endif +endif + TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) ifeq ($(OS_TYPE),windows) @@ -56,7 +62,7 @@ ifdef PEGASUS_HAS_MESSAGES ifdef ICU_ROOT ifdef ICU_INSTALL - SYS_LIBS += -L${ICU_INSTALL}/lib -licui18n -licuuc + SYS_LIBS += -L${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -licui18n -licuuc endif endif endif @@ -90,17 +96,17 @@ ifdef ICU_ROOT ifdef ICU_INSTALL ifdef PEGASUS_USE_RELEASE_DIRS - $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/lib -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) + $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) else - $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/lib -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) + $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) endif endif endif else ifdef PEGASUS_USE_RELEASE_DIRS - $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) + $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) -Xlinker -rpath-link -Xlinker $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) else - $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) + $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) -Xlinker -rpath-link -Xlinker $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) endif endif else @@ -109,11 +115,11 @@ ifdef PEGASUS_HAS_MESSAGES ifdef ICU_ROOT ifdef ICU_INSTALL - $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) + $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) endif endif else - $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) + $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) endif else $(LINK_WRAPPER) $(CXX) -Wl,-brtl -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) @@ -147,3 +153,5 @@ -include $(OBJ_DIR)/depend.mak include $(ROOT)/mak/misc.mak + +include $(ROOT)/mak/install-program-unix.mak --- pegasus-2.5/mak/library-unix.mak.redhat 2005-05-12 11:27:28.000000000 -0400 +++ pegasus-2.5/mak/library-unix.mak 2005-10-03 17:14:54.000000000 -0400 @@ -32,11 +32,11 @@ ifdef PEGASUS_HAS_MESSAGES ifdef ICU_ROOT ifdef ICU_INSTALL - LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT) + LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) endif endif else - LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT) + LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) endif else LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -Wl,-bhalt:$(AIX_LD_HALT) @@ -56,12 +56,12 @@ endif ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes) ifdef PEGASUS_USE_RELEASE_DIRS - LINK_COMMAND += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib + LINK_COMMAND += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR) ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC) - LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR) + LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR) -Wl,+cdp,$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR):$(PEGASUS_DEST_LIB_DIR) endif else - LINK_COMMAND += -Wl,+b$(LIB_DIR):/usr/lib + LINK_COMMAND += -Wl,+b$(LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR) endif endif LINK_COMMAND += -Wl,+s @@ -79,10 +79,10 @@ ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU) ifdef PEGASUS_USE_RELEASE_DIRS LINK_COMMAND = $(CXX) -shared - LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) + LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -L$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) -Xlinker -rpath-link -Xlinker $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) $(EXTRA_LINK_ARGUMENTS) else LINK_COMMAND = $(CXX) -shared - LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS) + LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -L$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) -Xlinker -rpath-link -Xlinker $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) $(EXTRA_LINK_ARGUMENTS) endif else LINK_COMMAND = $(CXX) -dynamiclib @@ -164,3 +164,5 @@ ln -f -s $(LIBRARY)$(SUFFIX) $(LIBRARY).$(PLATFORM_SUFFIX) FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB) + +include $(ROOT)/mak/install-library-unix.mak --- pegasus-2.5/rpm/wbem.redhat 2003-03-13 12:25:15.000000000 -0500 +++ pegasus-2.5/rpm/wbem 2005-10-03 17:12:17.000000000 -0400 @@ -1,13 +1,7 @@ #%PAM-1.0 -auth required /lib/security/pam_env.so -auth sufficient /lib/security/pam_unix.so likeauth nullok -auth required /lib/security/pam_deny.so - -account required /lib/security/pam_unix.so - -password required /lib/security/pam_cracklib.so retry=3 type= -password sufficient /lib/security/pam_unix.so nullok use_authtok md5 shadow -password required /lib/security/pam_deny.so - -session required /lib/security/pam_limits.so -session required /lib/security/pam_unix.so +auth include system-auth +account required pam_access.so accessfile=/etc/Pegasus/access.conf +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so --- pegasus-2.5/rpm/tog-pegasus.rc.redhat 2005-05-29 02:43:30.000000000 -0400 +++ pegasus-2.5/rpm/tog-pegasus.rc 2005-10-03 17:12:17.000000000 -0400 @@ -1,34 +1,28 @@ #! /bin/sh -#//%2005//////////////////////////////////////////////////////////////////////// -#// -#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development -#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. -#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; -#// IBM Corp.; EMC Corporation, The Open Group. -#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; -#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. -#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; -#// EMC Corporation; VERITAS Software Corporation; The Open Group. -#// -#// 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. -#// -#//============================================================================== -#// -#//%///////////////////////////////////////////////////////////////////////////// +#%///////////////////////////////////////////////////////////////////////////// +# +# Copyright (c) 2004 BMC Software, Hewlett-Packard Company, IBM, +# The Open Group, Tivoli Systems +# +# 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. +# +#============================================================================== +# +#%///////////////////////////////////////////////////////////////////////////// ### BEGIN INIT INFO # Provides: tog-pegasus @@ -40,7 +34,10 @@ # Description: init script for Pegasus CIM server ### END INIT INFO -CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver +CIMSERVER_BIN=/usr/sbin/cimserver +PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=server.pem} +PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=file.pem} +PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=client.pem} prog=cimserver test -x $CIMSERVER_BIN || exit 5 @@ -50,19 +47,22 @@ case "$1" in start) + [ -e /var/run/tog-pegasus/cimxml.socket ] && rm -f /var/run/tog-pegasus/cimxml.socket echo -n $"Starting up CIM server: " + if [ ! -e /etc/Pegasus/ssl.cnf ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_CERT_FILE ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_KEY_FILE ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_TRUSTSTORE ]; then + echo "Generating SSL certificates..."; + /usr/share/Pegasus/scripts/genSSLcerts; + fi; $CIMSERVER_BIN RETVAL=$? [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start" - echo ;; - stop) echo -n $"Shutting down CIM server: " killproc cimserver RETVAL=$? [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop" - echo + [ "$RETVAL" -eq 0 ] && [ -e /var/run/tog-pegasus/cimxml.socket ] && rm -f /var/run/tog-pegasus/cimxml.socket ;; status) pid=`pidofproc $CIMSERVER_BIN` --- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/ProviderManagerModule.cpp.redhat 2005-04-18 17:18:24.000000000 -0400 +++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/ProviderManagerModule.cpp 2005-10-03 17:12:17.000000000 -0400 @@ -134,7 +134,7 @@ int main(int argc, char** argv) { - const char * verbose = getenv("PEGASUS_TEST_VERBOSE"); + const char * verbose = getenv("PEGASUS_TEST_VERBOSE"), *p; const String FILE_NAME = FileSystem::buildLibraryFileName("TestProviderManager"); @@ -146,7 +146,11 @@ #elif defined (PEGASUS_OS_VMS) fileName= FILE_NAME; #else - fileName=String(getenv("PEGASUS_HOME"))+String("/lib/")+FILE_NAME; + fileName= String(getenv("PEGASUS_HOME")) + + String("/") + + String(((p = getenv("PEGASUS_ARCH_LIB_DIR")) == 0L) ? "lib" : p) + + String("/") + + FILE_NAME; #endif Test1(); --- pegasus-2.5/src/Pegasus/ProviderManager2/CMPI/samples/ProcessIndication/Makefile.redhat 2005-05-12 11:30:52.000000000 -0400 +++ pegasus-2.5/src/Pegasus/ProviderManager2/CMPI/samples/ProcessIndication/Makefile 2005-10-03 17:12:17.000000000 -0400 @@ -29,7 +29,7 @@ # Makefile for CMPIRT_SampleClass library # Change the following lines to match the values on your system -PEGDIRLIB=$(PEGASUS_HOME)/lib +PEGDIRLIB=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) # Changes shouldn't be necessary below this line CFLAGS=-Wall -D_COMPILE_UNIX -g -I. -I../.. --- pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h.redhat 2005-07-15 19:02:21.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h 2005-10-03 17:12:17.000000000 -0400 @@ -45,19 +45,19 @@ {"enableBinaryRepository", "false"}, #endif #if defined(PEGASUS_USE_RELEASE_DIRS) && !defined(PEGASUS_OS_LSB) - {"traceFilePath", "/var/opt/tog-pegasus/cache/trace/cimserver.trc"}, + {"traceFilePath", "/var/lib/Pegasus/cache/cimserver.trc"}, #if !defined(PEGASUS_USE_SYSLOGS) - {"logdir", "/var/opt/tog-pegasus/log"}, + {"logdir", "/var/log/Pegasus"}, #endif - {"passwordFilePath", "/etc/opt/tog-pegasus/cimserver.passwd"}, - {"sslCertificateFilePath", "/etc/opt/tog-pegasus/server.pem"}, - {"sslKeyFilePath", "/etc/opt/tog-pegasus/file.pem"}, - {"sslTrustStore", "/etc/opt/tog-pegasus/cimserver_trust"}, - {"exportSSLTrustStore", "/etc/opt/tog-pegasus/indication_trust"}, - {"crlStore", "/etc/opt/tog-pegasus/crl"}, - {"repositoryDir", "/var/opt/tog-pegasus/repository"}, - {"providerDir", "/opt/tog-pegasus/providers/lib:/usr/lib/cmpi"}, - {"messageDir", "/opt/tog-pegasus/share/locale/ICU_Messages"}, + {"passwordFilePath", "/etc/Pegasus/cimserver.passwd"}, + {"sslCertificateFilePath", "/etc/Pegasus/server.pem"}, + {"sslKeyFilePath", "/etc/Pegasus/file.pem"}, + {"sslTrustStore", "/etc/Pegasus/cimserver_trust"}, + {"exportSSLTrustStore", "/etc/Pegasus/indication_trust"}, + {"crlStore", "/etc/Pegasus/crl"}, + {"repositoryDir", "/var/lib/Pegasus/repository"}, + {"providerDir", PEGASUS_DEST_LIB_DIR "/Pegasus/providers"}, + {"messageDir", "/usr/share/locale"}, #endif #if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB) {"traceFilePath", "/var/opt/lsb-pegasus/cache/cimserver.trc"}, --- pegasus-2.5/src/Pegasus/Config/ConfigFileDirLinux.h.redhat 2005-02-05 18:00:07.000000000 -0500 +++ pegasus-2.5/src/Pegasus/Config/ConfigFileDirLinux.h 2005-10-03 17:12:17.000000000 -0400 @@ -37,12 +37,12 @@ /** Default file name for the current configuration. */ -static char CURRENT_CONFIG_FILE [] = "/var/opt/tog-pegasus/cimserver_current.conf"; +static char CURRENT_CONFIG_FILE [] = "/etc/Pegasus/cimserver_current.conf"; /** Default file name for the planned configuration. */ -static char PLANNED_CONFIG_FILE [] = "/var/opt/tog-pegasus/cimserver_planned.conf"; +static char PLANNED_CONFIG_FILE [] = "/etc/Pegasus/cimserver_planned.conf"; /** Default file name for the cimserver startup file containing the PID. --- pegasus-2.5/src/Pegasus/ControlProviders/CertificateProvider/Makefile.redhat 2005-05-12 11:29:46.000000000 -0400 +++ pegasus-2.5/src/Pegasus/ControlProviders/CertificateProvider/Makefile 2005-10-03 17:12:17.000000000 -0400 @@ -56,8 +56,8 @@ ifeq ($(OS),linux) EXTRA_LIBRARIES += -lcrypt ifdef PEGASUS_HAS_SSL - EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto - EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib + EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) -lssl -lcrypto + EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) endif endif --- pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile.redhat 2005-05-12 11:28:46.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile 2005-10-03 17:12:17.000000000 -0400 @@ -45,7 +45,7 @@ ifeq ($(PEGASUS_OS_TYPE),VMS) $(PROGRAM) libTestDynLib else - $(PROGRAM) $(HOME_DIR)/lib/libTestDynLib$(LIB_SUFFIX) + $(PROGRAM) $(HOME_DIR)/$(PEGASUS_ARCH_LIB_DIR)/libTestDynLib$(LIB_SUFFIX) endif endif --- pegasus-2.5/src/Pegasus/Common/MessageQueueService.cpp.redhat 2005-08-16 18:46:53.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/MessageQueueService.cpp 2005-10-03 17:12:17.000000000 -0400 @@ -68,7 +68,9 @@ #define MAX_THREADS_PER_SVC_QUEUE_LIMIT 5000 #define MAX_THREADS_PER_SVC_QUEUE_DEFAULT 5 - +#ifndef MAX_THREADS_PER_SVC_QUEUE +#define MAX_THREADS_PER_SVC_QUEUE MAX_THREADS_PER_SVC_QUEUE_DEFAULT +#endif Uint32 max_threads_per_svc_queue; PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL --- pegasus-2.5/src/Pegasus/Common/Makefile.redhat 2005-06-12 18:31:19.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/Makefile 2005-10-03 17:12:17.000000000 -0400 @@ -165,8 +165,8 @@ ifeq ($(OS),linux) EXTRA_LIBRARIES += -lcrypt ifdef PEGASUS_HAS_SSL - EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto - EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib + EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) -lssl -lcrypto + EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) endif endif @@ -206,11 +206,11 @@ ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib ifdef PEGASUS_HAS_SSL - SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib + SYS_LIBS += /libpath:$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) libeay32.lib ssleay32.lib endif ifdef PEGASUS_WINDOWS_SDK_HOME FLAGS += -DPEGASUS_WINDOWS_SDK_HOME - SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib + SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/$(PEGASUS_ARCH_LIB_DIR) secur32.lib else ifneq ($(CL_MAJOR_VERSION), 12) SYS_LIBS += secur32.lib --- pegasus-2.5/src/Pegasus/Common/Constants.h.redhat 2005-07-27 17:02:36.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/Constants.h 2005-10-03 17:12:17.000000000 -0400 @@ -380,21 +380,21 @@ # define PEGASUS_PAM_STANDALONE_PROC_NAME "/opt/freeware/cimom/pegasus/bin/cimservera" # elif defined(PEGASUS_OS_LINUX) && !defined(PEGASUS_OS_LSB) # undef PEGASUS_SSLCLIENT_CERTIFICATEFILE -# define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/tog-pegasus/client.pem" +# define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/Pegasus/client.pem" # undef PEGASUS_SSLCLIENT_RANDOMFILE -# define PEGASUS_SSLCLIENT_RANDOMFILE "/var/opt/tog-pegasus/ssl.rnd" +# define PEGASUS_SSLCLIENT_RANDOMFILE "/var/lib/Pegasus/ssl.rnd" # undef PEGASUS_SSLSERVER_RANDOMFILE -# define PEGASUS_SSLSERVER_RANDOMFILE "/var/opt/tog-pegasus/cimserver.rnd" +# define PEGASUS_SSLSERVER_RANDOMFILE "/var/lib/Pegasus/cimserver.rnd" # undef PEGASUS_LOCAL_AUTH_DIR -# define PEGASUS_LOCAL_AUTH_DIR "/var/opt/tog-pegasus/cache/localauth" +# define PEGASUS_LOCAL_AUTH_DIR "/var/lib/Pegasus/cache/localauth" # undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH -# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH "/var/run/tog-pegasus/socket/cimxml.socket" +# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH "/var/run/tog-pegasus/cimxml.socket" # undef PEGASUS_CORE_DIR -# define PEGASUS_CORE_DIR "/var/opt/tog-pegasus/cache" +# define PEGASUS_CORE_DIR "/var/lib/Pegasus/cache" # undef PEGASUS_PAM_STANDALONE_PROC_NAME -# define PEGASUS_PAM_STANDALONE_PROC_NAME "/opt/tog-pegasus/sbin/cimservera" +# define PEGASUS_PAM_STANDALONE_PROC_NAME "/usr/sbin/cimservera" # undef PEGASUS_PROVIDER_AGENT_PROC_NAME -# define PEGASUS_PROVIDER_AGENT_PROC_NAME "/opt/tog-pegasus/sbin/cimprovagt" +# define PEGASUS_PROVIDER_AGENT_PROC_NAME "/usr/sbin/cimprovagt" # elif defined(PEGASUS_OS_LSB) # define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/lsb-pegasus/client.pem" # undef PEGASUS_SSLCLIENT_RANDOMFILE --- pegasus-2.5/src/Pegasus/Common/System.cpp.redhat 2005-06-06 10:27:55.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/System.cpp 2005-10-03 17:12:17.000000000 -0400 @@ -144,13 +144,13 @@ char *System::extract_file_path(const char *fullpath, char *dirname) { char *p; - char buff[2048]; + char buff[PEGASUS_PATH_MAX]; if (fullpath == NULL) { dirname[0] = '\0'; return dirname; } - strcpy(buff, fullpath); + strncpy(buff, fullpath, PEGASUS_PATH_MAX); for(p = buff + strlen(buff); p >= buff; p--) { if (*p == '\\' || *p == '/') --- pegasus-2.5/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h.redhat 2005-02-26 00:22:13.000000000 -0500 +++ pegasus-2.5/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h 2005-10-03 17:12:17.000000000 -0400 @@ -72,9 +72,12 @@ #include #include #include // For MAXHOSTNAMELEN - +#include // For _POSIX_HOST_NAME_LEN #if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) -#define PEGASUS_MAXHOSTNAMELEN 64 +#if defined(_POSIX_HOST_NAME_MAX) +#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX+1) +#else +#define PEGASUS_MAXHOSTNAMELEN 256 +#endif #endif - #endif /* Pegasus_Platform_LINUX_IX86_GNU_h */ --- pegasus-2.5/src/Pegasus/Common/SystemUnix.cpp.redhat 2005-07-19 15:31:26.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/SystemUnix.cpp 2005-10-03 17:12:17.000000000 -0400 @@ -566,7 +566,7 @@ if ((he = gethostbyname (hostName))) { - strcpy (hostName, he->h_name); + strncpy (hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN); } #if defined(PEGASUS_OS_OS400) --- pegasus-2.5/src/Pegasus/Common/Config.h.redhat 2005-05-05 14:18:42.000000000 -0400 +++ pegasus-2.5/src/Pegasus/Common/Config.h 2005-10-03 17:12:17.000000000 -0400 @@ -182,6 +182,13 @@ #define PEGASUS_MAXHOSTNAMELEN MAXHOSTNAMELEN #endif +#ifndef PEGASUS_PATH_MAX +#ifndef PATH_MAX +#define PEGASUS_PATH_MAX 4096 +#else +#define PEGASUS_PATH_MAX PATH_MAX +#endif +#endif #ifdef __cplusplus PEGASUS_NAMESPACE_BEGIN --- pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp.redhat 2005-03-02 13:17:32.000000000 -0500 +++ pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp 2005-10-03 17:12:17.000000000 -0400 @@ -310,7 +310,7 @@ he=gethostbyname(hostName); if (he) { - strcpy(hostName, he->h_name); + strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN); } _hostName.assign(hostName); --- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp.redhat 2005-02-05 18:01:03.000000000 -0500 +++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp 2005-10-03 17:12:17.000000000 -0400 @@ -172,7 +172,7 @@ he=gethostbyname(hostName); if (he) { - strcpy(hostName, he->h_name); + strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN); } csName.assign(hostName); --- pegasus-2.5/src/Providers/ManagedSystem/Process/Process_Linux.cpp.redhat 2005-07-15 16:46:54.000000000 -0400 +++ pegasus-2.5/src/Providers/ManagedSystem/Process/Process_Linux.cpp 2005-10-03 17:12:17.000000000 -0400 @@ -782,7 +782,7 @@ he=gethostbyname(hostName); if (he) { - strcpy(hostName, he->h_name); + strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN); } csName.assign(hostName); --- pegasus-2.5/src/Clients/repupgrade/RepositoryUpgrade.cpp.redhat 2005-06-03 16:04:34.000000000 -0400 +++ pegasus-2.5/src/Clients/repupgrade/RepositoryUpgrade.cpp 2005-10-03 17:12:17.000000000 -0400 @@ -2075,7 +2075,7 @@ fileName = _pegasusHome + "/bin/" + FileSystem::buildLibraryFileName(moduleName); #else - fileName = _pegasusHome + "/lib/" + + fileName = _pegasusHome + PEGASUS_DEST_LIB_DIR + FileSystem::buildLibraryFileName(moduleName); #endif --- NEW FILE rpm_build_env --- # Pegasus RPM %build + %install environment setup: # # compile options: # export PEGASUS_EXTRA_C_FLAGS="$RPM_OPT_FLAGS -fPIC -g -Wall -Wno-unused" export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS" export PEGASUS_EXE_LINK_FLAGS="$RPM_OPT_FLAGS -g -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack" export SYS_INCLUDES=-I/usr/kerberos/include # # build object directories: # export SRCNAME=pegasus export PEGASUS_ROOT=${RPM_BUILD_DIR}/${SRCNAME}-${RPM_PACKAGE_VERSION} export ROOT=$PEGASUS_ROOT export PEGASUS_HOME=${RPM_BUILD_ROOT}/build export PEGASUS_ARCH_LIB_DIR=${RPM_ARCH_LIB} # # PEGASUS_PLATFORM (hardware platform) setup: # if [ -z "$RPM_ARCH" ]; then export RPM_ARCH=`/bin/uname -i`; fi; case ${RPM_ARCH} in ia64|x86_64) export PEGASUS_PLATFORM=LINUX_IA64_GNU; ;; ppc) export PEGASUS_PLATFORM=LINUX_PPC_GNU; ;; ppc64|pseries) export PEGASUS_PLATFORM=LINUX_PPC64_GNU; ;; s390) export PEGASUS_PLATFORM=LINUX_ZSERIES_GNU; export PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"; export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"; ;; s390x|zseries) export PEGASUS_PLATFORM=LINUX_ZSERIES64_GNU; export PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"; export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"; ;; i386) export PEGASUS_PLATFORM=LINUX_IX86_GNU ;; *) echo "Architecture unsupported by pegasus: $RPM_ARCH"; exit 1; ;; esac; # # Pegasus Build options: # export OPENSSL_HOME=/usr export PEGASUS_HAS_SSL=yes # per bug #368 export PEGASUS_USE_RELEASE_DIRS=true export PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true # per PEP #144 export PEGASUS_PAM_AUTHENTICATION=true export PAM_CONFIG_DIR=/etc/pam.d # # export PEGASUS_USE_PAM_STANDALONE_PROC=true # NO, we do NOT use 'cimservera' on Red Hat platforms! # export PEGASUS_CIM_SCHEMA=CIM29 export PEGASUS_LOCAL_DOMAIN_SOCKET=true export PEGASUS_USE_SYSLOGS=true export PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true # per PEP #174 export PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true export PEGASUS_HAS_PERFSTATS=true export PEGASUS_NOASSERTS=true # enable CMPI !! : PEGASUS_ENABLE_CQL=true # export PEGASUS_DISABLE_CQL=true export PEGASUS_DISABLE_OBJECT_NORMALIZATION=true export PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true export PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true export PEGASUS_USE_RELEASE_DIRS=true # # Pegasus Directory Structure: # export PEGASUS_PROD_DIR=/usr export PEGASUS_PRODSHARE_DIR=${PEGASUS_PROD_DIR}/share/Pegasus export PEGASUS_DOC_DIR=/usr/share/doc/tog-pegasus-${RPM_PACKAGE_VERSION} export PEGASUS_MAN_DIR=/usr/share/man export PEGASUS_MANUSER_DIR=${PEGASUS_MAN_DIR}/man1 export PEGASUS_MANADMIN_DIR=${PEGASUS_MAN_DIR}/man8 export PEGASUS_MOF_DIR=${PEGASUS_PRODSHARE_DIR}/mof export PEGASUS_DEST_LIB_DIR=${PEGASUS_PROD_DIR}/${PEGASUS_ARCH_LIB_DIR} export PEGASUS_PROVIDER_DIR=${PEGASUS_DEST_LIB_DIR}/Pegasus/providers export PEGASUS_PROVIDER_LIB_DIR=${PEGASUS_PROVIDER_DIR} export PEGASUS_SBIN_DIR=${PEGASUS_PROD_DIR}/sbin export PEGASUS_BIN_DIR=${PEGASUS_PROD_DIR}/bin export PEGASUS_VARDATA_DIR=/var/lib/Pegasus export PEGASUS_REPOSITORY_PARENT_DIR=${PEGASUS_VARDATA_DIR} export PEGASUS_REPOSITORY_DIR=${PEGASUS_REPOSITORY_PARENT_DIR}/repository export PEGASUS_PREV_REPOSITORY_DIR=${PEGASUS_REPOSITORY_PARENT_DIR}/prev_repository export PEGASUS_CONFIG_DIR=/etc/Pegasus export PEGASUS_VARRUN_DIR=/var/run/tog-pegasus export PEGASUS_CIMSERVER_START_FILE=${PEGASUS_VARRUN_DIR}/cimserver.pid export PEGASUS_LOCAL_DOMAIN_SOCKET_DIR=${PEGASUS_VARRUN_DIR} export PEGASUS_LOCAL_DOMAIN_SOCKET_PATH=${PEGASUS_LOCAL_DOMAIN_SOCKET_DIR}/cimxml.socket export PEGASUS_VARDATA_CACHE_DIR=${PEGASUS_VARDATA_DIR}/cache export PEGASUS_LOCAL_AUTH_DIR=${PEGASUS_VARDATA_CACHE_DIR}/localauth export PEGASUS_TRACE_DIR=${PEGASUS_VARDATA_CACHE_DIR}/trace export PEGASUS_PLANNED_CONFIG_FILE=cimserver_planned.conf export PEGASUS_CURRENT_CONFIG_FILE=cimserver_current.conf export PEGASUS_PEM_DIR=${PEGASUS_CONFIG_DIR} export PEGASUS_LOG_DIR=/var/log/Pegasus export PEGASUS_SSL_KEY_FILE=file.pem export PEGASUS_SSL_CERT_FILE=server.pem export PEGASUS_SSL_TRUSTSTORE=client.pem export PEGASUS_SAMPLES_DIR=${PEGASUS_PRODSHARE_DIR}/samples export PEGASUS_INCLUDE_DIR=${PEGASUS_PROD_DIR}/include export PEGASUS_HTML_DIR=${PEGASUS_PRODSHARE_DIR}/html export PEGASUS_TEST_DIR=${PEGASUS_PRODSHARE_DIR}/test export PEGASUS_TEST_REPOSITORY_DIR=${PEGASUS_VARDATA_DIR} export PEGASUS_TEST_REPOSITORY_NAME=testrepository export PRODUCT_DIRECTORY_STRUCTURE=(\ ${PEGASUS_PROD_DIR} \ ${PEGASUS_PRODSHARE_DIR} \ ${PEGASUS_DOC_DIR} \ ${PEGASUS_MAN_DIR} \ ${PEGASUS_MANUSER_DIR} \ ${PEGASUS_MANADMIN_DIR} \ ${PEGASUS_DEST_LIB_DIR} \ ${PEGASUS_PROVIDER_DIR} \ ${PEGASUS_PROVIDER_LIB_DIR} \ ${PEGASUS_SBIN_DIR} \ ${PEGASUS_BIN_DIR} \ ${PEGASUS_MOF_DIR} \ ${PEGASUS_VARDATA_DIR} \ ${PEGASUS_REPOSITORY_DIR} \ ${PEGASUS_VARDATA_CACHE_DIR} \ ${PEGASUS_TRACE_DIR} \ ${PEGASUS_LOG_DIR} \ ${PEGASUS_LOCAL_AUTH_DIR} \ ${PEGASUS_VARRUN_DIR} \ ${PEGASUS_LOCAL_DOMAIN_SOCKET_DIR} \ ${PEGASUS_CONFIG_DIR}); --- NEW FILE tog-pegasus.spec --- ################################################################################ # # OpenPegasus (Red Hat release) RPM .spec file # %{?!WITH_TEST: %define WITH_TEST 0} # do "rpmbuild --define 'WITH_TEST 1'" to build test RPM . # NOTE: Must use "rpm -[iU]vh --define 'WITH_TEST 1'" for all RPMs if test rpm # is to be installed. # DO NOT install test rpm for production use. %{?!AUTOSTART: %define AUTOSTART 0} # Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled # (chkconfig --level=345 tog-pegasus on) after installation. # #%define debug_package %{nil} Summary: OpenPegasus WBEM Services for Linux Name: tog-pegasus Version: 2.5 Release: 1.fe4 Epoch: 2 Group: Systems Management/Base License: Open Group Pegasus Open Source BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.openpegasus.org/ %define srcname pegasus Source0: %{srcname}-%{version}.tar.gz Source1: rpm_build_env Source2: README.RedHat.Security Source3: access.conf Source4: genSSLcerts Patch0: pegasus-2.5-redhat.patch Patch1: pegasus-2.5-local-or-remote-auth.patch Patch2: pegasus-2.5-make_install.patch Patch3: pegasus-2.5-add_cmpi_provider_lib.patch Patch4: pegasus-2.5-enable_cql.patch Patch5: pegasus-2.5-bz173401.patch BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++, libstdc++, make, pam-devel, krb5-devel, krb5-libs, openssl-devel >= 0.9.6, e2fsprogs Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools Requires(post): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools Requires(pre): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools Requires(postun): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools %description OpenPegasus WBEM Services for Linux enables management solutions that deliver increased control of enterprise resources. WBEM is a platform and resource independent DMTF standard that defines a common information model and communication protocol for monitoring and controlling resources from diverse sources. %package devel Summary: The OpenPegasus Software Development Kit Group: Systems Management/Base Requires: tog-pegasus >= 2.5 %description devel The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the OpenPegasus WBEM Services for Linux release. It provides Linux C++ developers with the WBEM files required to build WBEM Clients and Providers. It also supports C provider developers via the CMPI interface. %if %{WITH_TEST} %package test Summary: The OpenPegasus Tests Group: Systems Management/Base Autoreq: 0 Requires: tog-pegasus >= 2.5 %description test The OpenPegasus WBEM tests for the OpenPegasus 2.5 Linux rpm. ********************************************************************************** *** DO NOT INSTALL THIS RPM ON A PRODUCTION SYSTEM - THIS IS FOR TESTING ONLY. *** ********************************************************************************** %endif %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 -b .redhat %patch1 -p1 -b .local_or_remote_auth %patch2 -p1 -b .make_install %patch3 -p1 -b .add_cmpi_provider_lib %patch4 -p1 -b .enable_cql #%patch5 -p1 -b .bz173401 %build rm -rf $RPM_BUILD_ROOT export RPM_ARCH_LIB=%{_lib} . %SOURCE1 make export LD_LIBRARY_PATH=$PEGASUS_HOME/%{_lib} export PATH=$PEGASUS_HOME/bin:$PATH make repository make --directory=mak -f SDKMakefile stageSDK %if %{WITH_TEST} export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status export PEGASUS_STAGING_DIR=$RPM_BUILD_ROOT make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST unset PEGASUS_STAGING_DIR %endif %install export RPM_ARCH_LIB=%{_lib} . %SOURCE1 export PEGASUS_DESTDIR=$RPM_BUILD_ROOT export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status export PATH=${PEGASUS_HOME}/bin:$PATH export LD_LIBRARY_PATH=${PEGASUS_HOME}/%{_lib}:/%{_lib}:/usr/%{_lib} unset PEGASUS_STAGING_DIR export PEGASUS_SDK_STAGING_DIR=${PEGASUS_HOME}/stageSDK make install rm -rf $PEGASUS_HOME mkdir -p $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR},${PEGASUS_VARRUN_DIR},${PEGASUS_LOG_DIR},$PEGASUS_VARDATA_DIR} touch $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR}/{cimserver_{current,planned}.conf,ssl.cnf,client.pem,server.pem,file.pem,client_2048.pem,server_2048.pem,file_2048.pem},${PEGASUS_LOG_DIR}/install.log,${PEGASUS_VARRUN_DIR}/cimxml.socket} mkdir -p $RPM_BUILD_ROOT/var/lib/Pegasus/prev_repository cp -fp %SOURCE2 ${PEGASUS_ROOT}/doc cp -fp %SOURCE3 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf chmod 640 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf mkdir -p $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts cp -fp %SOURCE4 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts chmod 750 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts/genSSLcerts mkdir -p $R$RPM_BUILD_ROOT/usr/%{_lib}/cmpi #/usr/lib/rpm/brp-compress #exit 0 :; %files %defattr(0640,root,pegasus,0750) %dir /etc/Pegasus %dir /var/lib/Pegasus %attr(1750,root,pegasus) /var/run/tog-pegasus %dir /var/log/Pegasus %config %attr(750,root,root) /etc/rc.d/init.d/tog-pegasus %ghost %config(noreplace) /etc/Pegasus/cimserver_current.conf %ghost %config(noreplace) /etc/Pegasus/cimserver_planned.conf %config(noreplace) /etc/Pegasus/access.conf %config(noreplace) /etc/pam.d/wbem %ghost /etc/Pegasus/ssl.cnf %ghost /etc/Pegasus/client.pem %ghost /etc/Pegasus/server.pem %ghost /etc/Pegasus/file.pem %ghost /etc/Pegasus/client_2048.pem %ghost /etc/Pegasus/server_2048.pem %ghost /etc/Pegasus/file_2048.pem %ghost /var/log/Pegasus/install.log %ghost /var/lib/Pegasus/prev_repository /var/lib/Pegasus/repository /var/lib/Pegasus/cache %attr(0750,root,pegasus) /usr/sbin/* %attr(0755,root,pegasus) /usr/bin/* %attr(0755,root,pegasus) /usr/%{_lib}/*.so.* %dir /usr/%{_lib}/Pegasus/providers %dir /usr/%{_lib}/cmpi %attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so.* /usr/share/Pegasus/mof %dir /usr/share/Pegasus/scripts %attr(0755,root,pegasus) /usr/share/Pegasus/scripts/genSSLcerts /usr/share/man/man*/* %doc doc/license.txt doc/Admin_Guide_Release.pdf doc/README.RedHat.Security doc/SecurityGuidelinesForDevelopers.html doc/PegasusSSLGuidelines.htm doc/MessageQueueService.html doc/ProviderLoading.txt %files devel %defattr(0644,root,pegasus,0755) /usr/include/Pegasus /usr/share/Pegasus/samples /usr/share/Pegasus/html %attr(0755,root,pegasus) /usr/%{_lib}/*.so %attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so %if %{WITH_TEST} %post test /etc/init.d/tog-pegasus stop cd /var/lib/Pegasus mv repository repository.bak mv testrepository repository /usr/share/Pegasus/scripts/genSSLcerts cd /usr/share/Pegasus/test make create_providerlinks make tests %files test %defattr(-,root,root,-) /var/lib/Pegasus/testrepository /usr/share/Pegasus/test %endif %pre if [ $1 -gt 1 ]; then if [ -d /var/lib/Pegasus/repository/root\#PG_Internal ]; then # # Save the current repository to prev_repository. # if [ -d /var/lib/Pegasus/prev_repository ]; then /bin/mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave; fi /bin/mv /var/lib/Pegasus/repository /var/lib/Pegasus/prev_repository fi; elif [ $1 -eq 1 ]; then # first install: create the 'pegasus' user and group: # By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network if ! /usr/bin/id pegasus >/dev/null 2>&1; then for((uid=466; uid<500; uid++)) do if /usr/sbin/groupadd pegasus -g $uid >/dev/null 2>&1 && /usr/sbin/useradd -u $uid -c "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus -s /sbin/nologin -r -d /var/lib/Pegasus pegasus >/dev/null 2>&1; then break; else if egrep -q '^pegasus:.*:'$uid':' /etc/group; then groupdel pegasus >/dev/null 2>&1; fi; if [ $uid -eq 499 ]; then uid=100; elif [ $uid -eq 465 ]; then break; fi; fi; done; fi; fi %post if [ $1 -eq 1 ]; then /sbin/ldconfig %if %{AUTOSTART} /sbin/chkconfig --add tog-pegasus %endif echo `date` >/var/log/Pegasus/install.log 2>&1 elif [ $1 -gt 0 ]; then /sbin/service tog-pegasus condrestart :; fi %preun if [ $1 -eq 0 ]; then service tog-pegasus stop >/dev/null 2>&1 /sbin/chkconfig --del tog-pegasus; fi %postun if [ $1 -eq 0 ]; then # /usr/sbin/userdel pegasus >/dev/null 2>&1 || :; # /usr/sbin/groudel pegasus >/dev/null 2>&1 || :; :; fi; %clean rm -rf $RPM_BUILD_ROOT; #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version}; %changelog * Thu Dec 15 2005 Jason Vas Dias - 2:2.5-5 - fix bug 175434 : deal with pegasus uid/gid already existing on first install * Fri Dec 09 2005 Jesse Keating - 2:2.5-4.1 - rebuilt * Wed Nov 16 2005 Jason Vas Dias - 2:2.5-4 - fix bug 173401: SSL support broken by openssl-0.9.7g -> 0.9.8a upgrade * Wed Nov 09 2005 Jason Vas Dias - 2:2.5-3 - Rebuild for new openssl dependencies - Enable CMPI support for sblim-cmpi-base with ENABLE_CQL=true * Mon Oct 31 2005 Jason Vas Dias - 2:2.5-2 - Add /usr/lib/cmpi alternate providerLibDir for sblim-cmpi-base Fedora Extras pkg - Fix bug 171124: use numeric ids for pegasus user/group - guidelines: do not remove pegasus user/group in %%postun. * Fri Oct 14 2005 Tomas Mraz - use include instead of pam_stack in pam config * Fri Sep 30 2005 Jason Vas Dias - 2:2.5-1 - Implemented new 'make install' target. - Re-wrote tog-pegasus.spec file from scratch. - Ported BZ 167986 authentication code and BZ 167164 + BZ 167165 fixes from RHEL-4 * Wed Sep 28 2005 Jason Vas Dias - 2:2.5-0 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Feb 2006 00:06:43 -0000 1.1 +++ .cvsignore 2 Feb 2006 00:08:51 -0000 1.2 @@ -0,0 +1 @@ +pegasus-2.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Feb 2006 00:06:43 -0000 1.1 +++ sources 2 Feb 2006 00:08:51 -0000 1.2 @@ -0,0 +1 @@ +0b068fd576f199f8a0946e2f659acfe4 pegasus-2.5.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 00:08:29 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Wed, 1 Feb 2006 19:08:29 -0500 Subject: rpms/tog-pegasus import.log,1.1,1.2 Message-ID: <200602020009.k1209OQP021880@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/tog-pegasus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21820 Modified Files: import.log Log Message: auto-import tog-pegasus-2.5-1.fe4 on branch devel from tog-pegasus-2.5-1.fe4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Feb 2006 00:06:23 -0000 1.1 +++ import.log 2 Feb 2006 00:08:29 -0000 1.2 @@ -0,0 +1 @@ +tog-pegasus-2_5-1_fe4:HEAD:tog-pegasus-2.5-1.fe4.src.rpm:1138838904 From fedora-extras-commits at redhat.com Thu Feb 2 00:14:52 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Wed, 1 Feb 2006 19:14:52 -0500 Subject: owners owners.list,1.594,1.595 Message-ID: <200602020015.k120FO6E021991@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21972/owners Modified Files: owners.list Log Message: added tog-pegasus: owner jvdias at redhat.com Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.594 retrieving revision 1.595 diff -u -r1.594 -r1.595 --- owners.list 1 Feb 2006 16:51:56 -0000 1.594 +++ owners.list 2 Feb 2006 00:14:51 -0000 1.595 @@ -1268,6 +1268,7 @@ Fedora Extras|tklib|Useful extensions for Tk|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|tla|The Low-Budget arch Revision Control System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|tog-pegasus|The Open Group Pegasus WBEM/CIM server|jvdias at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Feb 2 00:33:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 1 Feb 2006 19:33:42 -0500 Subject: rpms/perl-Parse-CPAN-Packages/devel perl-Parse-CPAN-Packages.spec, 1.1, 1.2 Message-ID: <200602020034.k120YEpj022118@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22101 Modified Files: perl-Parse-CPAN-Packages.spec Log Message: Drop explicit Requires. Index: perl-Parse-CPAN-Packages.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel/perl-Parse-CPAN-Packages.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Parse-CPAN-Packages.spec 26 Jan 2006 21:28:13 -0000 1.1 +++ perl-Parse-CPAN-Packages.spec 2 Feb 2006 00:33:41 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Parse-CPAN-Packages Version: 2.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parse::CPAN::Packages - Parse 02packages.details.txt.gz License: GPL or Artistic Group: Development/Libraries @@ -13,10 +13,7 @@ BuildRequires: perl(IO::Zlib) BuildRequires: perl(Module::Build) BuildRequires: perl(Sort::Versions) -Requires: perl(CPAN::DistnameInfo) Requires: perl(Class::Accessor::Fast) -Requires: perl(IO::Zlib) -Requires: perl(Sort::Versions) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -59,5 +56,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 01 2006 Steven Pritchard 2.25-2 +- Drop explicit Requires (except perl(Class::Accessor::Fast), which isn't + picked up automatically). + * Mon Sep 19 2005 Steven Pritchard 2.25-1 - Specfile autogenerated. From fedora-extras-commits at redhat.com Thu Feb 2 01:21:15 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 1 Feb 2006 20:21:15 -0500 Subject: rpms/python-sqlite2/devel .cvsignore, 1.3, 1.4 python-sqlite2.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200602020121.k121LmNR025768@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/python-sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25747 Modified Files: .cvsignore python-sqlite2.spec sources Log Message: Update to 2.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jan 2006 13:15:59 -0000 1.3 +++ .cvsignore 2 Feb 2006 01:21:15 -0000 1.4 @@ -1 +1 @@ -pysqlite-2.1.0.tar.gz +pysqlite-2.1.3.tar.gz Index: python-sqlite2.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-sqlite2.spec 17 Jan 2006 13:15:59 -0000 1.2 +++ python-sqlite2.spec 2 Feb 2006 01:21:15 -0000 1.3 @@ -1,7 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-sqlite2 -Version: 2.1.0 +Version: 2.1.3 Release: 1%{?dist} Summary: DB-API 2.0 interface for SQLite 3.x @@ -14,8 +15,9 @@ BuildRequires: dos2unix BuildRequires: python-devel BuildRequires: python-setuptools -BuildRequires: sqlite-devel -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +BuildRequires: sqlite-devel >= 3.3.3 + +Requires: sqlite >= 3.3.3 %description pysqlite is an interface to the SQLite 3.x embedded relational database @@ -71,6 +73,7 @@ %{python_sitearch}/pysqlite2/test/types.pyc %{python_sitearch}/pysqlite2/test/userfunctions.py %{python_sitearch}/pysqlite2/test/userfunctions.pyc +%{python_sitearch}/pysqlite-%{version}-py%{pyver}.egg-info/ %ghost %{python_sitearch}/pysqlite2/__init__.pyo %ghost %{python_sitearch}/pysqlite2/dbapi2.pyo %ghost %{python_sitearch}/pysqlite2/test/dbapi.pyo @@ -82,6 +85,9 @@ %changelog +* Thu Feb 2 2006 Dawid Gajownik - 2.1.3-1 +- Update to 2.1.3 + * Tue Jan 17 2006 Dawid Gajownik - 2.1.0-1 - Update to 2.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jan 2006 13:15:59 -0000 1.3 +++ sources 2 Feb 2006 01:21:15 -0000 1.4 @@ -1 +1 @@ -67530a31508f33d64e86b3e5071822d9 pysqlite-2.1.0.tar.gz +55ef66a963ddff5540b117db0a6c085b pysqlite-2.1.3.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 04:45:59 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Wed, 1 Feb 2006 23:45:59 -0500 Subject: rpms/new import.log,1.3,1.4 Message-ID: <200602020446.k124kV7Z003024@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/new In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2988 Modified Files: import.log Log Message: auto-import new-1.3.6-1 on branch devel from new-1.3.6-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/new/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 24 Dec 2005 20:12:18 -0000 1.3 +++ import.log 2 Feb 2006 04:45:58 -0000 1.4 @@ -1,2 +1,3 @@ new-1_3_5-2:HEAD:new-1.3.5-2.src.rpm:1135031407 new-1_3_5-3:HEAD:new-1.3.5-3.src.rpm:1135455132 +new-1_3_6-1:HEAD:new-1.3.6-1.src.rpm:1138855552 From fedora-extras-commits at redhat.com Thu Feb 2 04:46:05 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Wed, 1 Feb 2006 23:46:05 -0500 Subject: rpms/new/devel .cvsignore,1.2,1.3 new.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200602020446.k124kbxd003031@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/new/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2988/devel Modified Files: .cvsignore new.spec sources Log Message: auto-import new-1.3.6-1 on branch devel from new-1.3.6-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/new/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Dec 2005 22:30:18 -0000 1.2 +++ .cvsignore 2 Feb 2006 04:46:05 -0000 1.3 @@ -1 +1 @@ -new-1.3.5.tar.gz +new-1.3.6.tar.gz Index: new.spec =================================================================== RCS file: /cvs/extras/rpms/new/devel/new.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- new.spec 24 Dec 2005 20:12:25 -0000 1.2 +++ new.spec 2 Feb 2006 04:46:05 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A simple template system Name: new -Version: 1.3.5 -Release: 3 +Version: 1.3.6 +Release: 1 License: GPL Group: Development/Tools Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz @@ -98,8 +98,11 @@ %changelog +* Wed Feb 02 2006 W. Michael Petullo - 1.3.6-1 + - Updated to new 1.3.6. + * Sat Dec 24 2005 W. Michael Petullo - 1.3.5-3 - - Add %defattr for %files devel. + - Add %%defattr for %%files devel. * Tue Dec 13 2005 W. Michael Petullo - 1.3.5-2 - Broke out -devel package. @@ -109,7 +112,3 @@ * Sun Dec 11 2005 W. Michael Petullo - 1.3.5-1 - Updated to new 1.3.5. - - - - Index: sources =================================================================== RCS file: /cvs/extras/rpms/new/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Dec 2005 22:30:18 -0000 1.2 +++ sources 2 Feb 2006 04:46:05 -0000 1.3 @@ -1 +1 @@ -916a0ccdc842f11a15e3c4e2bf9048f8 new-1.3.5.tar.gz +61045de4410d1937f59224d3417691b2 new-1.3.6.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 10:31:56 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 05:31:56 -0500 Subject: rpms/fbdesk/devel fbdesk.spec,1.10,1.11 Message-ID: <200602021032.k12AWSmw015391@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15373 Modified Files: fbdesk.spec Log Message: - xft needs freetype... Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fbdesk.spec 29 Jan 2006 21:56:44 -0000 1.10 +++ fbdesk.spec 2 Feb 2006 10:31:54 -0000 1.11 @@ -14,6 +14,7 @@ BuildRequires: pkgconfig BuildRequires: libICE-devel libSM-devel libX11-devel libXext-devel BuildRequires: libXft-devel libXpm-devel libXrender-devel +BuildRequires: freetype-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Feb 2 10:34:56 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 2 Feb 2006 05:34:56 -0500 Subject: rpms/python-sqlite2/devel python-sqlite2.spec,1.3,1.4 Message-ID: <200602021035.k12AZSlT015458@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/python-sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15441 Modified Files: python-sqlite2.spec Log Message: Run tests in %check section Index: python-sqlite2.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-sqlite2.spec 2 Feb 2006 01:21:15 -0000 1.3 +++ python-sqlite2.spec 2 Feb 2006 10:34:56 -0000 1.4 @@ -3,7 +3,7 @@ Name: python-sqlite2 Version: 2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DB-API 2.0 interface for SQLite 3.x Group: Development/Languages @@ -46,6 +46,10 @@ dos2unix documentation/{silvercity.css,code/*} +%check +%{__python} setup.py test + + %clean rm -rf %{buildroot} @@ -85,6 +89,9 @@ %changelog +* Thu Feb 2 2006 Dawid Gajownik - 2.1.3-2 +- Run tests in %%check section + * Thu Feb 2 2006 Dawid Gajownik - 2.1.3-1 - Update to 2.1.3 From fedora-extras-commits at redhat.com Thu Feb 2 10:37:01 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 05:37:01 -0500 Subject: rpms/fbdesk/devel fbdesk.spec,1.11,1.12 Message-ID: <200602021037.k12AbY1A015529@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15512 Modified Files: fbdesk.spec Log Message: - add dist Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fbdesk.spec 2 Feb 2006 10:31:54 -0000 1.11 +++ fbdesk.spec 2 Feb 2006 10:37:01 -0000 1.12 @@ -1,6 +1,6 @@ Name: fbdesk Version: 1.2.1 -Release: 3 +Release: 3%{?dist} Summary: Icon Manager for Fluxbox From fedora-extras-commits at redhat.com Thu Feb 2 10:45:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 05:45:54 -0500 Subject: rpms/fbdesk/devel fbdesk.spec,1.12,1.13 Message-ID: <200602021046.k12AkQqn015622@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15605 Modified Files: fbdesk.spec Log Message: - stupid me... meant fontconfig... Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fbdesk.spec 2 Feb 2006 10:37:01 -0000 1.12 +++ fbdesk.spec 2 Feb 2006 10:45:54 -0000 1.13 @@ -14,7 +14,7 @@ BuildRequires: pkgconfig BuildRequires: libICE-devel libSM-devel libX11-devel libXext-devel BuildRequires: libXft-devel libXpm-devel libXrender-devel -BuildRequires: freetype-devel +BuildRequires: fontconfig-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Feb 2 10:56:09 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Thu, 2 Feb 2006 05:56:09 -0500 Subject: rpms/workrave/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 workrave.spec, 1.1, 1.2 workrave-1.8.1-locale-mo-ext.patch, 1.1, NONE Message-ID: <200602021056.k12AufoM015727@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15706 Modified Files: .cvsignore sources workrave.spec Removed Files: workrave-1.8.1-locale-mo-ext.patch Log Message: * Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 - Updated version, dropped obsolete patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Oct 2005 10:21:00 -0000 1.2 +++ .cvsignore 2 Feb 2006 10:56:09 -0000 1.3 @@ -1 +1 @@ -workrave-1.8.1.tar.gz +workrave-1.8.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Oct 2005 10:21:00 -0000 1.2 +++ sources 2 Feb 2006 10:56:09 -0000 1.3 @@ -1 +1 @@ -3a22ef8488fc2c9fe3b02f9c33b1cfb2 workrave-1.8.1.tar.gz +0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/workrave.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workrave.spec 24 Oct 2005 10:21:00 -0000 1.1 +++ workrave.spec 2 Feb 2006 10:56:09 -0000 1.2 @@ -1,6 +1,6 @@ Name: workrave -Version: 1.8.1 -Release: 4%{?dist} +Version: 1.8.2 +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.1-locale-mo-ext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: gnet2-devel @@ -24,8 +23,6 @@ %prep %setup -q -%patch1 -p1 -b .mo-ext - %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -64,6 +61,9 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 +- Updated version, dropped obsolete patch + * Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 - Added a desktop file - Added find_lang --- workrave-1.8.1-locale-mo-ext.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 2 11:12:03 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Thu, 2 Feb 2006 06:12:03 -0500 Subject: rpms/workrave/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 workrave.spec, 1.1, 1.2 workrave-1.8.1-locale-mo-ext.patch, 1.1, NONE Message-ID: <200602021112.k12BCaFq017598@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17570 Modified Files: .cvsignore sources workrave.spec Removed Files: workrave-1.8.1-locale-mo-ext.patch Log Message: * Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 - Updated version, dropped obsolete patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Oct 2005 10:21:00 -0000 1.2 +++ .cvsignore 2 Feb 2006 11:11:58 -0000 1.3 @@ -1 +1 @@ -workrave-1.8.1.tar.gz +workrave-1.8.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Oct 2005 10:21:00 -0000 1.2 +++ sources 2 Feb 2006 11:11:58 -0000 1.3 @@ -1 +1 @@ -3a22ef8488fc2c9fe3b02f9c33b1cfb2 workrave-1.8.1.tar.gz +0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/workrave.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workrave.spec 24 Oct 2005 10:21:00 -0000 1.1 +++ workrave.spec 2 Feb 2006 11:11:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: workrave -Version: 1.8.1 -Release: 4%{?dist} +Version: 1.8.2 +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.1-locale-mo-ext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: gnet2-devel @@ -24,8 +23,6 @@ %prep %setup -q -%patch1 -p1 -b .mo-ext - %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -64,6 +61,9 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 +- Updated version, dropped obsolete patch + * Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 - Added a desktop file - Added find_lang --- workrave-1.8.1-locale-mo-ext.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 2 11:26:01 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Thu, 2 Feb 2006 06:26:01 -0500 Subject: rpms/workrave/devel workrave.spec,1.2,1.3 Message-ID: <200602021126.k12BQXf5017731@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17712 Modified Files: workrave.spec Log Message: - Added missing buildrequires for modular X Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/workrave.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workrave.spec 2 Feb 2006 10:56:09 -0000 1.2 +++ workrave.spec 2 Feb 2006 11:26:01 -0000 1.3 @@ -14,6 +14,8 @@ BuildRequires: libgnomeuimm26-devel BuildRequires: gnome-panel-devel BuildRequires: desktop-file-utils +BuildRequires: libXmu-devel +BuildRequires: libXt-devel %description Workrave is a program that assists in the recovery and prevention of @@ -63,6 +65,7 @@ %changelog * Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 - Updated version, dropped obsolete patch +- Added missing buildrequires for modular X * Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 - Added a desktop file From fedora-extras-commits at redhat.com Thu Feb 2 11:28:26 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Thu, 2 Feb 2006 06:28:26 -0500 Subject: rpms/workrave/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 workrave.spec, 1.1, 1.2 workrave-1.8.1-locale-mo-ext.patch, 1.1, NONE Message-ID: <200602021128.k12BSxWU017812@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17784 Modified Files: .cvsignore sources workrave.spec Removed Files: workrave-1.8.1-locale-mo-ext.patch Log Message: * Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 - Updated version, dropped obsolete patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Oct 2005 10:21:00 -0000 1.2 +++ .cvsignore 2 Feb 2006 11:28:26 -0000 1.3 @@ -1 +1 @@ -workrave-1.8.1.tar.gz +workrave-1.8.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Oct 2005 10:21:00 -0000 1.2 +++ sources 2 Feb 2006 11:28:26 -0000 1.3 @@ -1 +1 @@ -3a22ef8488fc2c9fe3b02f9c33b1cfb2 workrave-1.8.1.tar.gz +0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/workrave.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workrave.spec 24 Oct 2005 10:21:00 -0000 1.1 +++ workrave.spec 2 Feb 2006 11:28:26 -0000 1.2 @@ -1,6 +1,6 @@ Name: workrave -Version: 1.8.1 -Release: 4%{?dist} +Version: 1.8.2 +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.1-locale-mo-ext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: gnet2-devel @@ -24,8 +23,6 @@ %prep %setup -q -%patch1 -p1 -b .mo-ext - %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -64,6 +61,9 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 +- Updated version, dropped obsolete patch + * Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 - Added a desktop file - Added find_lang --- workrave-1.8.1-locale-mo-ext.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 2 11:42:35 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Thu, 2 Feb 2006 06:42:35 -0500 Subject: rpms/workrave/devel workrave-1.8.2-cpp-fix.patch, NONE, 1.1 workrave.spec, 1.3, 1.4 Message-ID: <200602021143.k12Bh8aE017904@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17884 Modified Files: workrave.spec Added Files: workrave-1.8.2-cpp-fix.patch Log Message: - Fixed compilation on gcc-4.1 workrave-1.8.2-cpp-fix.patch: --- NEW FILE workrave-1.8.2-cpp-fix.patch --- --- workrave-1.8.2/frontend/gtkmm/src/GtkUtil.hh.cpp-fix 2005-09-23 21:22:33.000000000 +0200 +++ workrave-1.8.2/frontend/gtkmm/src/GtkUtil.hh 2006-02-02 12:39:26.000000000 +0100 @@ -56,11 +56,11 @@ create_label(std::string text, bool bold); static Gtk::Widget * - GtkUtil::create_label_with_tooltip(std::string text, + create_label_with_tooltip(std::string text, std::string tooltip); static EventImage * - GtkUtil::create_image_with_tooltip(std::string file, + create_image_with_tooltip(std::string file, std::string tooltip); static Gtk::Widget * @@ -84,7 +84,7 @@ static void set_wmclass(Gtk::Window &window, std::string class_postfix); static void center_window(Gtk::Window &window, HeadInfo &head); - static bool GtkUtil::has_button_images(); + static bool has_button_images(); }; #endif // GTKMMGUI_HH Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/workrave.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- workrave.spec 2 Feb 2006 11:26:01 -0000 1.3 +++ workrave.spec 2 Feb 2006 11:42:35 -0000 1.4 @@ -8,6 +8,8 @@ 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 BuildRequires: gnet2-devel @@ -25,6 +27,8 @@ %prep %setup -q +%patch1 -p1 -b .cpp-fix + %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -66,6 +70,7 @@ * 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 Thu Feb 2 11:52:52 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 2 Feb 2006 06:52:52 -0500 Subject: rpms/pam_usb/devel pam_usb.spec,1.1,1.2 Message-ID: <200602021153.k12BrOKS017968@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/pam_usb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17951 Modified Files: pam_usb.spec Log Message: Index: pam_usb.spec =================================================================== RCS file: /cvs/extras/rpms/pam_usb/devel/pam_usb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pam_usb.spec 29 Dec 2005 12:58:04 -0000 1.1 +++ pam_usb.spec 2 Feb 2006 11:52:52 -0000 1.2 @@ -1,7 +1,7 @@ Name: pam_usb Summary: PAM module for use with DSA key pairs and removable devices Version: 0.3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://www.pamusb.org @@ -35,7 +35,7 @@ Summary: Hotplug agent to use with USB flash Group: System Environment/Base Requires: %{name} = %{version}-%{release} -Requires: hotplug +Requires: udev %description hotplug Hotplug agent to use with USB flash. @@ -97,6 +97,9 @@ %changelog +* Thu Feb 2 2006 Dmitry Butskoy - 0.3.3-3 +- pam_usb-hotplug requires udev now instead of the obsoleted hotplug + * Thu Dec 29 2005 Dmitry Butskoy - 0.3.3-2 - accepted for Fedora Extras (review by Wart ) From fedora-extras-commits at redhat.com Thu Feb 2 12:19:10 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 2 Feb 2006 07:19:10 -0500 Subject: fedora-security/audit fc4,1.140,1.141 fc5,1.50,1.51 Message-ID: <200602021219.k12CJA7L019995@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19970 Modified Files: fc4 fc5 Log Message: Note a mozilla/firefox issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- fc4 1 Feb 2006 20:35:06 -0000 1.140 +++ fc4 2 Feb 2006 12:19:02 -0000 1.141 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-0496 VULNERABLE (mozilla) +CVE-2006-0496 VULNERABLE (firefox) CVE-2006-0482 ** kernel CVE-2006-0481 version (libpng, 1.2.7 only) CVE-2006-0405 version (libtiff, 3.8.0 only) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- fc5 1 Feb 2006 20:35:06 -0000 1.50 +++ fc5 2 Feb 2006 12:19:02 -0000 1.51 @@ -14,6 +14,9 @@ 7. Double check vulnerables and file fc5test2 bugs ** are items that need attention + +CVE-2006-0496 VULNERABLE (mozilla) +CVE-2006-0496 VULNERABLE (firefox) CVE-2006-0482 ** kernel CVE-2006-0481 version (libpng, 1.2.7 only) CVE-2006-0405 version (libtiff, 3.8.0 only) From fedora-extras-commits at redhat.com Thu Feb 2 12:35:17 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 2 Feb 2006 07:35:17 -0500 Subject: rpms/gnome-translate/devel gnome-translate-0.99-eel2.patch, NONE, 1.1 gnome-translate.spec, 1.4, 1.5 Message-ID: <200602021235.k12CZnru020101@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/gnome-translate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20081 Modified Files: gnome-translate.spec Added Files: gnome-translate-0.99-eel2.patch Log Message: gnome-translate-0.99-eel2.patch: --- NEW FILE gnome-translate-0.99-eel2.patch --- diff -Nrbu gnome-translate-0.99/src/gt-app.c gnome-translate-0.99-OK/src/gt-app.c --- gnome-translate-0.99/src/gt-app.c 2005-01-28 15:31:53.000000000 +0300 +++ gnome-translate-0.99-OK/src/gt-app.c 2006-02-02 15:29:01.000000000 +0300 @@ -1168,8 +1168,7 @@ GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("Overwrite file?"), - secondary, - NULL); + secondary); g_free(secondary); gtk_dialog_set_default_response(GTK_DIALOG(confirmation_dialog), GTK_RESPONSE_NO); /* safe default */ diff -Nrbu gnome-translate-0.99/src/gt-util.c gnome-translate-0.99-OK/src/gt-util.c --- gnome-translate-0.99/src/gt-util.c 2005-01-28 15:32:27.000000000 +0300 +++ gnome-translate-0.99-OK/src/gt-util.c 2006-02-02 15:29:14.000000000 +0300 @@ -53,8 +53,7 @@ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, primary, - secondary, - NULL); + secondary); if (blocking) { Index: gnome-translate.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnome-translate.spec 13 Sep 2005 12:20:05 -0000 1.4 +++ gnome-translate.spec 2 Feb 2006 12:35:17 -0000 1.5 @@ -1,17 +1,18 @@ Name: gnome-translate Summary: GNOME interface to libtranslate -- Natural language translator Version: 0.99 -Release: 4%{?dist} +Release: 5%{?dist} Group: User Interface/Desktops License: GPL URL: http://www.nongnu.org/libtranslate/gnome-translate Source: http://savannah.nongnu.org/download/libtranslate/gnome-translate-%{version}.tar.gz +Patch0: gnome-translate-0.99-eel2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0 -BuildRequires: eel2-devel >= 2.6.0, libtranslate-devel, aspell-devel +BuildRequires: eel2-devel >= 2.13.0, libtranslate-devel, aspell-devel %if "%{?dist}" == ".fc5" BuildRequires: gnome-keyring-devel %endif @@ -37,6 +38,7 @@ %prep %setup -q +%patch0 -p1 %build @@ -120,6 +122,9 @@ %{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog +* Thu Feb 2 2006 Dmitry Butskoy - 0.99-5 +- add patch for compatibility with eel2 library >= 2.13 + * Tue Sep 13 2005 Dmitry Butskoy - 0.99-4 - Hack: add an extra dependency -- gnome-keyring-devel, due to missing one in current rawhide's libgnomeui-devel From fedora-extras-commits at redhat.com Thu Feb 2 12:47:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 07:47:27 -0500 Subject: rpms/koffice/devel .cvsignore, 1.6, 1.7 koffice.spec, 1.21, 1.22 sources, 1.6, 1.7 koffice-CAN-2005-3193.diff, 1.1, NONE koffice-kexi.patch, 1.1, NONE koffice-krita-kisclipboard.patch, 1.1, NONE koffice-krita-kisfilter.patch, 1.1, NONE koffice-kspread.patch, 1.1, NONE koffice-qt3.3.5.patch, 1.9, NONE Message-ID: <200602021248.k12Cm0g2020264@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20226 Modified Files: .cvsignore koffice.spec sources Removed Files: koffice-CAN-2005-3193.diff koffice-kexi.patch koffice-krita-kisclipboard.patch koffice-krita-kisfilter.patch koffice-kspread.patch koffice-qt3.3.5.patch Log Message: - upgrade to 1.5-beta1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Oct 2005 23:14:13 -0000 1.6 +++ .cvsignore 2 Feb 2006 12:47:27 -0000 1.7 @@ -1 +1 @@ -koffice-1.4.2.tar.bz2 +koffice-1.4.90.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- koffice.spec 15 Dec 2005 13:45:28 -0000 1.21 +++ koffice.spec 2 Feb 2006 12:47:27 -0000 1.22 @@ -1,24 +1,17 @@ Name: koffice -Version: 1.4.2 -Release: 3%{?dist} +Version: 1.4.90 +Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: http://download.kde.org/stable/koffice-1.4.2/src/koffice-1.4.2.tar.bz2 +Source0: http://download.kde.org/unstable/koffice-1.5-beta1/src/koffice-1.4.90.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -# fix CAN-2005-3193 see #175260 -Patch1: koffice-CAN-2005-3193.diff - -Patch100: koffice-krita-kisfilter.patch -Patch101: koffice-krita-kisclipboard.patch -Patch102: koffice-kspread.patch -Patch103: koffice-kexi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -60,6 +53,7 @@ BuildRequires: aspell-devel BuildRequires: libacl-devel BuildRequires: libxslt-devel +BuildRequires: OpenEXR-devel %description KOffice - Integrated Office Suite @@ -82,6 +76,7 @@ Requires: koffice-kchart Requires: koffice-kformula Requires: koffice-filters +Requires: koffice-plato %description suite KOffice - Integrated Office Suite @@ -196,14 +191,17 @@ %description filters %{summary} +%package kplato +Summary: An integrated project management and planning tool +Group: Applications/Productivity +Requires: %{name}-core = %{version}-%{release} + +%description kplato +%{summary} + %prep %setup -q %patch0 -p1 -%patch1 -%patch100 -%patch101 -p4 -%patch102 -p4 -%patch103 -p4 # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -256,12 +254,12 @@ $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop # kformdesigner -desktop-file-install \ - --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category=X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/kde/kformdesigner.desktop +# desktop-file-install \ +# --vendor=fedora \ +# --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ +# --add-category=X-Fedora \ +# --delete-original \ +# $RPM_BUILD_ROOT%{_datadir}/applications/kde/kformdesigner.desktop #kword desktop-file-install \ @@ -308,6 +306,41 @@ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --add-category=X-Fedora \ --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.desktop + +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_openexr.desktop + +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_png.desktop + +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_raw.desktop + +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_tiff.desktop + +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop #kugar @@ -355,7 +388,27 @@ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --add-category=X-Fedora \ --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/kde/kexi.desktop + $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kexi.desktop + +#kplato +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop + +#writeup +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Office/writeup.desktop + + +# maybe we should try without la again... +find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -396,13 +449,15 @@ %post filters -p /sbin/ldconfig %postun filters -p /sbin/ldconfig +%post kplato -p /sbin/ldconfig +%postun kplato -p /sbin/ldconfig + %files suite #empty => virtual package %files core %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB README -%{_bindir}/koscript %{_bindir}/koshell %{_bindir}/kthesaurus %{_bindir}/koconverter @@ -412,7 +467,6 @@ %{_libdir}/libkochart.* %{_libdir}/libkofficecore.* %{_libdir}/libkofficeui.* -%{_libdir}/libkoscript.* %{_libdir}/libkotext.* %{_libdir}/libkowmf.* %{_libdir}/libkopainter.* @@ -421,8 +475,12 @@ %{_libdir}/libkwmf.* %{_libdir}/libkdeinit_kformula.* %{_libdir}/libkformulalib.* +%{_libdir}/libkopalette.* +%{_libdir}/libkoproperty.* %{_libdir}/kde3/kfile_koffice.* %{_libdir}/kde3/kfile_ooo.* +%{_libdir}/kde3/kfile_abiword.* +%{_libdir}/kde3/kfile_gnumeric.* %{_libdir}/kde3/kodocinfopropspage.* %{_libdir}/kde3/kofficescan.* %{_libdir}/kde3/kofficethumbnail.* @@ -460,6 +518,20 @@ %{_datadir}/servicetypes/widgetfactory.desktop %{_datadir}/applications/fedora-KThesaurus.desktop %{_datadir}/applications/fedora-koshell.desktop +%{_datadir}/apps/kofficewidgets/pics/kounitdoublecombobox.png +%{_datadir}/apps/kofficewidgets/pics/kounitdoublelineedit.png +%{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png +%{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png +%{_datadir}/apps/kross +%{_datadir}/mimelnk/image/x-raw.desktop +# add writeup here for now +%{_bindir}/writeup +%{_libdir}/kde3/libwriteup_part.* +%{_libdir}/kde3/writeup.* +%{_libdir}/libkdeinit_writeup.* +%{_datadir}/applications/fedora-writeup.desktop +%{_datadir}/apps/writeup +%{_datadir}/services/writeuppart.desktop %files devel %{_includedir}/* @@ -469,6 +541,7 @@ %defattr(-,root,root,-) %{_bindir}/kword %{_libdir}/libkdeinit_kword.* +%{_libdir}/libkwordprivate.* %{_libdir}/kde3/libkwordpart.* %{_libdir}/kde3/kword.* %{_datadir}/apps/kword @@ -508,9 +581,18 @@ %{_bindir}/kpresenter %{_bindir}/kprconverter.pl %{_libdir}/libkdeinit_kpresenter.* +%{_libdir}/libkpresenterimageexport.* +%{_libdir}/libkpresenterprivate.* %{_libdir}/kde3/libkpresenterpart.* %{_libdir}/kde3/kformula.* %{_libdir}/kde3/kpresenter.* +%{_libdir}/kde3/libkpresenterbmpexport.* +%{_libdir}/kde3/libkpresenterjpegexport.* +%{_libdir}/kde3/libkpresentermngexport.* +%{_libdir}/kde3/libkpresenterpngexport.* +%{_libdir}/kde3/libkpresentersvgexport.* +%{_libdir}/kde3/libkpresenterxbmexport.* +%{_libdir}/kde3/libkpresenterxpmexport.* %{_datadir}/apps/kpresenter %{_datadir}/doc/HTML/en/kpresenter %{_datadir}/services/kpresenter*.desktop @@ -522,8 +604,8 @@ %defattr(-,root,root,-) %{_bindir}/karbon %{_libdir}/libkdeinit_karbon.* -%{_libdir}/libkarbonbase.* %{_libdir}/libkarboncommon.* +%{_libdir}/kde3/karbon_defaulttools.* %{_libdir}/kde3/karbon_flattenpathplugin.* %{_libdir}/kde3/karbon_imagetoolplugin.* %{_libdir}/kde3/karbon_insertknotsplugin.* @@ -548,11 +630,24 @@ %{_datadir}/templates/Illustration.desktop %{_datadir}/templates/.source/Illustration.karbon %{_datadir}/applications/fedora-karbon.desktop +%{_datadir}/doc/HTML/en/karbon/ %files krita %defattr(-,root,root,-) %{_bindir}/krita %{_libdir}/libkdeinit_krita.* +%{_libdir}/libkrita_cmyk_u16.* +%{_libdir}/libkrita_gray_u16.* +%{_libdir}/libkrita_lms_f32.* +%{_libdir}/libkrita_rgb_f16half.* +%{_libdir}/libkrita_rgb_f32.* +%{_libdir}/libkrita_rgb_u16.* +%{_libdir}/libkritacolor.* +%{_libdir}/libkritagrayscale.* +%{_libdir}/libkritaimage.* +%{_libdir}/libkritargb.* +%{_libdir}/libkritascripting.* +%{_libdir}/libkritaui.* %{_libdir}/libkritacommon.* %{_libdir}/kde3/kritacimg.* %{_libdir}/kde3/kritacolorrange.* @@ -583,11 +678,44 @@ %{_libdir}/kde3/libkritapart.* %{_libdir}/kde3/libkritamagickexport.* %{_libdir}/kde3/libkritamagickimport.* +%{_libdir}/kde3/krita_cmyk_u16_plugin.* +%{_libdir}/kde3/krita_gray_u16_plugin.* +%{_libdir}/kde3/krita_lms_f32_plugin.* +%{_libdir}/kde3/krita_rgb_f16half_plugin.* +%{_libdir}/kde3/krita_rgb_f32_plugin.* +%{_libdir}/kde3/krita_rgb_u16_plugin.* +%{_libdir}/kde3/kritabumpmap.* +%{_libdir}/kde3/kritacmykplugin.* +%{_libdir}/kde3/kritacubismfilter.* +%{_libdir}/kde3/kritadropshadow.* +%{_libdir}/kde3/kritafiltersgallery.* +%{_libdir}/kde3/kritahistogramdocker.* +%{_libdir}/kde3/kritaimageenhancement.* +%{_libdir}/kde3/kritapixelizefilter.* +%{_libdir}/kde3/kritaroundcornersfilter.* +%{_libdir}/kde3/kritascripting.* +%{_libdir}/kde3/kritaseparatechannels.* +%{_libdir}/kde3/kritasmalltilesfilter.* +%{_libdir}/kde3/kritasmearybrush.* +%{_libdir}/kde3/kritasobelfilter.* +%{_libdir}/kde3/kritatoolselectsimilar.* +%{_libdir}/kde3/kritawetplugin.* +%{_libdir}/kde3/libkrita_openexr_export.* +%{_libdir}/kde3/libkrita_openexr_import.* +%{_libdir}/kde3/libkrita_raw_import.* +%{_libdir}/kde3/libkritajpegexport.* +%{_libdir}/kde3/libkritajpegimport.* +%{_libdir}/kde3/libkritapngexport.* +%{_libdir}/kde3/libkritapngimport.* +%{_libdir}/kde3/libkritatiffexport.* +%{_libdir}/kde3/libkritatiffimport.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop %{_datadir}/servicetypes/krita*.desktop -%{_datadir}/applications/fedora-krita.desktop -%{_datadir}/applications/fedora-krita_magick.desktop +%{_datadir}/applications/fedora-krita*.desktop +%{_datadir}/apps/kritaplugins +%{_datadir}/doc/HTML/en/krita +%{_datadir}/servicetypes/karbon_module.desktop %files kugar %defattr(-,root,root,-) @@ -611,8 +739,6 @@ %files kexi %defattr(-,root,root,-) %{_bindir}/kexi -%{_bindir}/keximigratetest -%{_bindir}/kformdesigner %{_bindir}/ksqlite* %{_libdir}/libkdeinit_kexi.* %{_libdir}/libkexicore.* @@ -624,15 +750,17 @@ %{_libdir}/libkexiguiutils.* %{_libdir}/libkeximain.* %{_libdir}/libkeximigrate.* -%{_libdir}/libkexipropertyeditor.* %{_libdir}/libkexirelationsview.* %{_libdir}/libkexisql2.* %{_libdir}/libkexisql3.* %{_libdir}/libkformdesigner.* +%{_libdir}/libkexiutils.* +%{_libdir}/kde3/kformdesigner_containers.* +%{_libdir}/kde3/kformdesigner_kexidbwidgets.* +%{_libdir}/kde3/kformdesigner_stdwidgets.* %{_libdir}/kde3/kexidb_mysqldriver.* %{_libdir}/kde3/kexidb_sqlite2driver.* %{_libdir}/kde3/kexidb_sqlite3driver.* -%{_libdir}/kde3/kexidbwidgets.* %{_libdir}/kde3/kexihandler_form.* %{_libdir}/kde3/kexihandler_migration.* %{_libdir}/kde3/kexihandler_query.* @@ -641,11 +769,16 @@ %{_libdir}/kde3/kexihandler_table.* %{_libdir}/kde3/keximigrate_mysql.* %{_libdir}/kde3/kexi.* -%{_libdir}/kde3/libkformdesigner_part.* %{_libdir}/kde3/kexidb_pqxxsqldriver.* %{_libdir}/kde3/keximigrate_pqxx.* -%{_libdir}/kde3/containers.* -%{_libdir}/kde3/stdwidgets.* +%{_libdir}/kde3/kexihandler_csv_importexport.* +%{_libdir}/kde3/krosskexiapp.* +%{_libdir}/kde3/krosskexidb.* +%{_libdir}/kde3/krosskritacore.* +%{_libdir}/kde3/krosspython.* +%{_libdir}/kde3/krossruby.* +%{_libdir}/libkrossapi.* +%{_libdir}/libkrossmain.* %{_datadir}/config/kexirc %{_datadir}/config/magic/kexi.magic %{_datadir}/mimelnk/application/* @@ -655,22 +788,26 @@ %{_datadir}/services/keximigrate_mysql.desktop %{_datadir}/services/keximigrate_pqxx.desktop %{_datadir}/apps/kexi -%{_datadir}/apps/kformdesigner -%{_datadir}/apps/kformdesigner_part %{_datadir}/services/kformdesigner/* -%{_datadir}/services/kformdesigner_part.desktop -%{_datadir}/applications/fedora-kformdesigner.desktop +%{_datadir}/doc/HTML/en/kexi %{_datadir}/applications/fedora-kexi.desktop + %files kchart %defattr(-,root,root,-) %{_bindir}/kchart %{_libdir}/libkchartcommon.* %{_libdir}/libkdeinit_kchart.* +%{_libdir}/libkchartimageexport.* %{_libdir}/kde3/kchart.* %{_libdir}/kde3/libkchartpart.* %{_libdir}/kde3/libkchartpngexport.* %{_libdir}/kde3/libkchartsvgexport.* +%{_libdir}/kde3/libkchartbmpexport.* +%{_libdir}/kde3/libkchartjpegexport.* +%{_libdir}/kde3/libkchartmngexport.* +%{_libdir}/kde3/libkchartxbmexport.* +%{_libdir}/kde3/libkchartxpmexport.* %{_datadir}/apps/kchart %{_datadir}/services/kchart*.desktop %{_datadir}/doc/HTML/en/kchart @@ -691,14 +828,15 @@ %{_bindir}/kivio %{_libdir}/libkdeinit_kivio.* %{_libdir}/libkiviocommon.* -%{_libdir}/libkivioconnectortool.* -%{_libdir}/libkivioselecttool.* -%{_libdir}/libkiviotargettool.* -%{_libdir}/libkiviotexttool.* -%{_libdir}/libkiviozoomtool.* %{_libdir}/kde3/kivio.* %{_libdir}/kde3/libkiviopart.* %{_libdir}/kde3/straight_connector.* +%{_libdir}/kde3/libkivioconnectortool.* +%{_libdir}/kde3/libkivioimageexport.* +%{_libdir}/kde3/libkivioselecttool.* +%{_libdir}/kde3/libkiviotargettool.* +%{_libdir}/kde3/libkiviotexttool.* +%{_libdir}/kde3/libkiviozoomtool.* %{_datadir}/apps/kivio %{_datadir}/config.kcfg/kivio.kcfg %{_datadir}/doc/HTML/en/kivio @@ -733,7 +871,6 @@ %{_libdir}/kde3/libkwordlatexexport.* %{_libdir}/kde3/libmswriteexport.* %{_libdir}/kde3/libmswriteimport.* -%{_libdir}/kde3/libolefilter.* %{_libdir}/kde3/libooimpressexport.* %{_libdir}/kde3/libooimpressimport.* %{_libdir}/kde3/liboowriterexport.* @@ -750,13 +887,31 @@ %{_libdir}/kde3/libmswordimport.* %{_libdir}/kde3/libxsltimport.* %{_libdir}/kde3/libxsltexport.* +%{_libdir}/kde3/libhancomwordimport.* +%{_libdir}/kde3/libkfosvgexport.* +%{_libdir}/kde3/liboodrawimport.* +%{_libdir}/kde3/libpowerpointimport.* %{_datadir}/apps/xsltfilter %{_datadir}/services/generic_filter.desktop -%{_datadir}/services/ole*.desktop %{_datadir}/services/xslt*.desktop %{_datadir}/servicetypes/kofilter*.desktop +%files kplato +%defattr(-,root,root,-) +%{_bindir}/kplato +%{_libdir}/libkdeinit_kplato.* +%{_libdir}/kde3/kplato.* +%{_libdir}/kde3/libkplatopart.* +%{_datadir}/apps/kplato +%{_datadir}/doc/HTML/en/kplato +%{_datadir}/services/kplatopart.desktop +%{_datadir}/applications/fedora-kplato.desktop + %changelog +* Wed Feb 01 2006 Andreas Bierfert +1.4.90-1 +- version upgrade + * Thu Dec 08 2005 Andreas Bierfert 1.4.2-3 - fix CAN-2005-3193 Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Oct 2005 23:14:13 -0000 1.6 +++ sources 2 Feb 2006 12:47:27 -0000 1.7 @@ -1 +1 @@ -6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 +99a8de4e93b00e1c3148a5f96b67d966 koffice-1.4.90.tar.bz2 --- koffice-CAN-2005-3193.diff DELETED --- --- koffice-kexi.patch DELETED --- --- koffice-krita-kisclipboard.patch DELETED --- --- koffice-krita-kisfilter.patch DELETED --- --- koffice-kspread.patch DELETED --- --- koffice-qt3.3.5.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 2 12:47:44 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Feb 2006 07:47:44 -0500 Subject: owners owners.list,1.595,1.596 Message-ID: <200602021248.k12CmGfi020269@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20212 Modified Files: owners.list Log Message: + fonttools Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.595 retrieving revision 1.596 diff -u -r1.595 -r1.596 --- owners.list 2 Feb 2006 00:14:51 -0000 1.595 +++ owners.list 2 Feb 2006 12:47:44 -0000 1.596 @@ -228,6 +228,7 @@ Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|fontforge|An outline and bitmap font editor|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|fonts-hebrew-fancy|Fancy Hebrew fonts|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| +Fedora Extras|fonttools|A tool to convert True/OpenType fonts to XML and back|roozbeh at farsiweb.info|extras-qa at fedoraproject| Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|foremost|Program that recovers files by carving them from a raw disk|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|fortune-firefly|An addon of Firefly quotes for fortune-mod|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Feb 2 12:56:40 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Feb 2006 07:56:40 -0500 Subject: rpms/fonttools - New directory Message-ID: <200602021256.k12CugDC020451@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20442/fonttools Log Message: Directory /cvs/extras/rpms/fonttools added to the repository From fedora-extras-commits at redhat.com Thu Feb 2 12:56:46 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Feb 2006 07:56:46 -0500 Subject: rpms/fonttools/devel - New directory Message-ID: <200602021256.k12CumRL020466@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20442/fonttools/devel Log Message: Directory /cvs/extras/rpms/fonttools/devel added to the repository From fedora-extras-commits at redhat.com Thu Feb 2 12:58:19 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Feb 2006 07:58:19 -0500 Subject: rpms/fonttools Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602021258.k12CwLYK020507@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20495 Added Files: Makefile import.log Log Message: Setup of module fonttools --- NEW FILE Makefile --- # Top level Makefile for module fonttools all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 2 12:58:25 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Feb 2006 07:58:25 -0500 Subject: rpms/fonttools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602021258.k12CwRVf020529@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20495/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fonttools --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: fonttools # $Id$ NAME := fonttools SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Feb 2 13:02:22 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Feb 2006 08:02:22 -0500 Subject: rpms/fonttools import.log,1.1,1.2 Message-ID: <200602021302.k12D2tAv022365@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22320 Modified Files: import.log Log Message: auto-import fonttools-2.0-0.3.20050624cvs on branch devel from fonttools-2.0-0.3.20050624cvs.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fonttools/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Feb 2006 12:58:19 -0000 1.1 +++ import.log 2 Feb 2006 13:02:22 -0000 1.2 @@ -0,0 +1 @@ +fonttools-2_0-0_3_20050624cvs:HEAD:fonttools-2.0-0.3.20050624cvs.src.rpm:1138885271 From fedora-extras-commits at redhat.com Thu Feb 2 13:02:30 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Feb 2006 08:02:30 -0500 Subject: rpms/fonttools/devel fonttools-20050315-20050624.patch, NONE, 1.1 fonttools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602021303.k12D320Q022377@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22320/devel Modified Files: .cvsignore sources Added Files: fonttools-20050315-20050624.patch fonttools.spec Log Message: auto-import fonttools-2.0-0.3.20050624cvs on branch devel from fonttools-2.0-0.3.20050624cvs.src.rpm fonttools-20050315-20050624.patch: --- NEW FILE fonttools-20050315-20050624.patch --- diff -urN fonttools-20050315/Lib/fontTools/fondLib.py fonttools-20050624/Lib/fontTools/fondLib.py --- fonttools-20050315/Lib/fontTools/fondLib.py 2002-10-29 19:19:25.000000000 +0330 +++ fonttools-20050624/Lib/fontTools/fondLib.py 2005-06-24 14:05:16.000000000 +0430 @@ -12,6 +12,7 @@ DEBUG = 0 headerformat = """ + > ffFlags: h ffFamID: h ffFirstChar: h @@ -127,9 +128,9 @@ def _getheader(self): data = self.FOND.data sstruct.unpack(headerformat, data[:28], self) - self.ffProperty = struct.unpack("9h", data[28:46]) - self.ffIntl = struct.unpack("hh", data[46:50]) - self.ffVersion, = struct.unpack("h", data[50:FONDheadersize]) + self.ffProperty = struct.unpack(">9h", data[28:46]) + self.ffIntl = struct.unpack(">hh", data[46:50]) + self.ffVersion, = struct.unpack(">h", data[50:FONDheadersize]) if DEBUG: self._rawheader = data[:FONDheadersize] @@ -137,9 +138,9 @@ def _buildheader(self): header = sstruct.pack(headerformat, self) - header = header + apply(struct.pack, ("9h",) + self.ffProperty) - header = header + apply(struct.pack, ("hh",) + self.ffIntl) - header = header + struct.pack("h", self.ffVersion) + header = header + apply(struct.pack, (">9h",) + self.ffProperty) + header = header + apply(struct.pack, (">hh",) + self.ffIntl) + header = header + struct.pack(">h", self.ffVersion) if DEBUG: print "header is the same?", self._rawheader == header and 'yes.' or 'no.' if self._rawheader <> header: @@ -149,12 +150,12 @@ def _getfontassociationtable(self): data = self.FOND.data offset = FONDheadersize - numberofentries, = struct.unpack("h", data[offset:offset+2]) + numberofentries, = struct.unpack(">h", data[offset:offset+2]) numberofentries = numberofentries + 1 size = numberofentries * 6 self.fontAssoc = [] for i in range(offset + 2, offset + size, 6): - self.fontAssoc.append(struct.unpack("3h", data[i:i+6])) + self.fontAssoc.append(struct.unpack(">3h", data[i:i+6])) self._endoffontassociationtable = offset + size + 2 if DEBUG: @@ -162,9 +163,9 @@ self.parsedthings.append((offset, self._endoffontassociationtable, 'fontassociationtable')) def _buildfontassociationtable(self): - data = struct.pack("h", len(self.fontAssoc) - 1) + data = struct.pack(">h", len(self.fontAssoc) - 1) for size, stype, ID in self.fontAssoc: - data = data + struct.pack("3h", size, stype, ID) + data = data + struct.pack(">3h", size, stype, ID) if DEBUG: print "font association table is the same?", self._rawfontassociationtable == data and 'yes.' or 'no.' @@ -194,10 +195,10 @@ return boxes = {} data = self._rawoffsettable[6:] - numstyles = struct.unpack("h", data[:2])[0] + 1 + numstyles = struct.unpack(">h", data[:2])[0] + 1 data = data[2:] for i in range(numstyles): - style, l, b, r, t = struct.unpack("hhhhh", data[:10]) + style, l, b, r, t = struct.unpack(">hhhhh", data[:10]) boxes[style] = (l, b, r, t) data = data[10:] self.boundingBoxes = boxes @@ -206,9 +207,9 @@ if self.boundingBoxes and self._rawoffsettable[:6] == '\0\0\0\0\0\6': boxes = self.boundingBoxes.items() boxes.sort() - data = '\0\0\0\0\0\6' + struct.pack("h", len(boxes) - 1) + data = '\0\0\0\0\0\6' + struct.pack(">h", len(boxes) - 1) for style, (l, b, r, t) in boxes: - data = data + struct.pack("hhhhh", style, l, b, r, t) + data = data + struct.pack(">hhhhh", style, l, b, r, t) self._rawoffsettable = data def _getglyphwidthtable(self): @@ -217,15 +218,15 @@ return data = self.FOND.data offset = self.ffWTabOff - numberofentries, = struct.unpack("h", data[offset:offset+2]) + numberofentries, = struct.unpack(">h", data[offset:offset+2]) numberofentries = numberofentries + 1 count = offset + 2 for i in range(numberofentries): - stylecode, = struct.unpack("h", data[count:count+2]) + stylecode, = struct.unpack(">h", data[count:count+2]) widthtable = self.widthTables[stylecode] = [] count = count + 2 for j in range(3 + self.ffLastChar - self.ffFirstChar): - width, = struct.unpack("h", data[count:count+2]) + width, = struct.unpack(">h", data[count:count+2]) widthtable.append(width) count = count + 2 @@ -238,15 +239,15 @@ self._rawglyphwidthtable = "" return numberofentries = len(self.widthTables) - data = struct.pack('h', numberofentries - 1) + data = struct.pack('>h', numberofentries - 1) tables = self.widthTables.items() tables.sort() for stylecode, table in tables: - data = data + struct.pack('h', stylecode) + data = data + struct.pack('>h', stylecode) if len(table) <> (3 + self.ffLastChar - self.ffFirstChar): raise error, "width table has wrong length" for width in table: - data = data + struct.pack('h', width) + data = data + struct.pack('>h', width) if DEBUG: print "glyph width table is the same?", self._rawglyphwidthtable == data and 'yes.' or 'no.' self._rawglyphwidthtable = data @@ -257,17 +258,17 @@ return data = self.FOND.data offset = self.ffKernOff - numberofentries, = struct.unpack("h", data[offset:offset+2]) + numberofentries, = struct.unpack(">h", data[offset:offset+2]) numberofentries = numberofentries + 1 count = offset + 2 for i in range(numberofentries): - stylecode, = struct.unpack("h", data[count:count+2]) + stylecode, = struct.unpack(">h", data[count:count+2]) count = count + 2 - numberofpairs, = struct.unpack("h", data[count:count+2]) + numberofpairs, = struct.unpack(">h", data[count:count+2]) count = count + 2 kerntable = self.kernTables[stylecode] = [] for j in range(numberofpairs): - firstchar, secondchar, kerndistance = struct.unpack("cch", data[count:count+4]) + firstchar, secondchar, kerndistance = struct.unpack(">cch", data[count:count+4]) kerntable.append((ord(firstchar), ord(secondchar), kerndistance)) count = count + 4 @@ -281,14 +282,14 @@ self.ffKernOff = 0 return numberofentries = len(self.kernTables) - data = [struct.pack('h', numberofentries - 1)] + data = [struct.pack('>h', numberofentries - 1)] tables = self.kernTables.items() tables.sort() for stylecode, table in tables: - data.append(struct.pack('h', stylecode)) - data.append(struct.pack('h', len(table))) # numberofpairs + data.append(struct.pack('>h', stylecode)) + data.append(struct.pack('>h', len(table))) # numberofpairs for firstchar, secondchar, kerndistance in table: - data.append(struct.pack("cch", chr(firstchar), chr(secondchar), kerndistance)) + data.append(struct.pack(">cch", chr(firstchar), chr(secondchar), kerndistance)) data = string.join(data, '') @@ -308,9 +309,9 @@ return data = self.FOND.data self.fondClass, self.glyphTableOffset, self.styleMappingReserved, = \ - struct.unpack("hll", data[offset:offset+10]) - self.styleIndices = struct.unpack('48b', data[offset + 10:offset + 58]) - stringcount, = struct.unpack('h', data[offset+58:offset+60]) + struct.unpack(">hll", data[offset:offset+10]) + self.styleIndices = struct.unpack('>48b', data[offset + 10:offset + 58]) + stringcount, = struct.unpack('>h', data[offset+58:offset+60]) count = offset + 60 for i in range(stringcount): @@ -331,14 +332,14 @@ if not self.styleIndices: self._rawstylemappingtable = "" return - data = struct.pack("hll", self.fondClass, self.glyphTableOffset, + data = struct.pack(">hll", self.fondClass, self.glyphTableOffset, self.styleMappingReserved) self._packstylestrings() - data = data + apply(struct.pack, ("48b",) + self.styleIndices) + data = data + apply(struct.pack, (">48b",) + self.styleIndices) stringcount = len(self.styleStrings) - data = data + struct.pack("h", stringcount) + data = data + struct.pack(">h", stringcount) for string in self.styleStrings: data = data + chr(len(string)) + string @@ -401,7 +402,7 @@ data = self._rawstylemappingtable if not data: return - data = data[:2] + struct.pack("l", self.glyphTableOffset) + data[6:] + data = data[:2] + struct.pack(">l", self.glyphTableOffset) + data[6:] self._rawstylemappingtable = data def _getglyphencodingsubtable(self): @@ -410,7 +411,7 @@ return offset = self.ffStylOff + self.glyphTableOffset data = self.FOND.data - numberofentries, = struct.unpack("h", data[offset:offset+2]) + numberofentries, = struct.unpack(">h", data[offset:offset+2]) count = offset + 2 for i in range(numberofentries): glyphcode = ord(data[count]) @@ -430,7 +431,7 @@ self._rawglyphencodingsubtable = "" return numberofentries = len(self.glyphEncoding) - data = struct.pack("h", numberofentries) + data = struct.pack(">h", numberofentries) items = self.glyphEncoding.items() items.sort() for glyphcode, glyphname in items: diff -urN fonttools-20050315/Lib/fontTools/misc/psCharStrings.py fonttools-20050624/Lib/fontTools/misc/psCharStrings.py --- fonttools-20050315/Lib/fontTools/misc/psCharStrings.py 2005-02-24 00:52:27.000000000 +0330 +++ fonttools-20050624/Lib/fontTools/misc/psCharStrings.py 2005-05-07 13:11:12.000000000 +0430 @@ -780,7 +780,8 @@ # def op_hflex(self, index): dx1, dx2, dy2, dx3, dx4, dx5, dx6 = self.popall() - dy1 = dy3 = dy4 = dy5 = dy6 = 0 + dy1 = dy3 = dy4 = dy6 = 0 + dy5 = -dy2 self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3)) self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) def op_flex(self, index): @@ -789,7 +790,9 @@ self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) def op_hflex1(self, index): dx1, dy1, dx2, dy2, dx3, dx4, dx5, dy5, dx6 = self.popall() - dy3 = dy4 = dy6 = 0 + dy3 = dy4 = 0 + dy6 = -(dy1 + dy2 + dy3 + dy4 + dy5) + self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3)) self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) def op_flex1(self, index): @@ -798,9 +801,9 @@ dy = dy1 + dy2 + dy3 + dy4 + dy5 if abs(dx) > abs(dy): dx6 = d6 - dy6 = 0 + dy6 = -dy else: - dx6 = 0 + dx6 = -dx dy6 = d6 self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3)) self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) diff -urN fonttools-20050315/Lib/fontTools/pens/basePen.py fonttools-20050624/Lib/fontTools/pens/basePen.py --- fonttools-20050315/Lib/fontTools/pens/basePen.py 2005-03-08 13:20:55.000000000 +0330 +++ fonttools-20050624/Lib/fontTools/pens/basePen.py 2005-04-10 17:48:42.000000000 +0430 @@ -162,8 +162,11 @@ of the base glyph and draws it onto self. """ from fontTools.pens.transformPen import TransformPen - glyph = self.glyphSet.get(glyphName) - if glyph is not None: + try: + glyph = self.glyphSet[glyphName] + except KeyError: + pass + else: tPen = TransformPen(self, transformation) glyph.draw(tPen) --- NEW FILE fonttools.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define alphatag 20050624cvs Name: fonttools Version: 2.0 Release: 0.3.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools License: BSD 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-numeric Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-numeric %description TTX/FontTools is a tool for manipulating TrueType and OpenType fonts. It is written in Python and has a BSD-style, open-source license. TTX can dump TrueType and OpenType fonts to an XML-based text format and vice versa. %prep %setup -q -n %{name} %patch1 -p1 -b .20050624 %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py %{__chmod} a-x LICENSE.txt %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{python_sitearch}/FontTools/fontTools/ttLib/test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt %doc Doc/bugs.txt Doc/ChangeLog.txt Doc/changes.txt Doc/documentation.html %{python_sitearch}/FontTools.pth %dir %{python_sitearch}/FontTools %dir %{python_sitearch}/FontTools/fontTools %dir %{python_sitearch}/FontTools/fontTools/encodings %dir %{python_sitearch}/FontTools/fontTools/misc %dir %{python_sitearch}/FontTools/fontTools/pens %dir %{python_sitearch}/FontTools/fontTools/ttLib %dir %{python_sitearch}/FontTools/fontTools/ttLib/tables %{python_sitearch}/FontTools/*.py %{python_sitearch}/FontTools/*.pyc %ghost %{python_sitearch}/FontTools/*.pyo %{python_sitearch}/FontTools/fontTools/*.py %{python_sitearch}/FontTools/fontTools/*.pyc %ghost %{python_sitearch}/FontTools/fontTools/*.pyo %{python_sitearch}/FontTools/fontTools/*/*.py %{python_sitearch}/FontTools/fontTools/*/*.pyc %ghost %{python_sitearch}/FontTools/fontTools/*/*.pyo %{python_sitearch}/FontTools/fontTools/*/*/*.py %{python_sitearch}/FontTools/fontTools/*/*/*.pyc %ghost %{python_sitearch}/FontTools/fontTools/*/*/*.pyo %{python_sitearch}/FontTools/fontTools/misc/eexecOp.so %{_bindir}/ttx %changelog * Wed Feb 01 2006 Roozbeh Pournader - 2.0-0.3.20050624cvs - Use upstream snapshots, moving the difference into a patch - Change alphatag time to the latest change in CVS - Use %%{python_sitearch} instead of %%{python_sitelib} (for x86_86) - Use sed instead of a patch to remove shebang * Sun Jan 08 2006 Roozbeh Pournader - 2.0-0.2.20060103cvs - Add %%{?dist} tag * Fri Jan 06 2006 Roozbeh Pournader - 2.0-0.1.20060103cvs - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Feb 2006 12:58:25 -0000 1.1 +++ .cvsignore 2 Feb 2006 13:02:30 -0000 1.2 @@ -0,0 +1 @@ +fonttools-2005-03-15.210812.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Feb 2006 12:58:25 -0000 1.1 +++ sources 2 Feb 2006 13:02:30 -0000 1.2 @@ -0,0 +1 @@ +b44a299a0530a2a4f65d1937aa99f734 fonttools-2005-03-15.210812.tar.bz2 From fedora-extras-commits at redhat.com Thu Feb 2 13:12:12 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Thu, 2 Feb 2006 08:12:12 -0500 Subject: rpms/firestarter/devel firestarter-1.0.3-nonroutable.patch, NONE, 1.1 firestarter.spec, 1.17, 1.18 Message-ID: <200602021312.k12DCkSL022457@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/firestarter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22437 Modified Files: firestarter.spec Added Files: firestarter-1.0.3-nonroutable.patch Log Message: fixes bug 179685 firestarter-1.0.3-nonroutable.patch: --- NEW FILE firestarter-1.0.3-nonroutable.patch --- diff -ur firestarter-1.0.3/scripts/non-routables firestarter-1.0.3-non/scripts/non-routables --- firestarter-1.0.3/scripts/non-routables 2005-01-29 04:32:09.000000000 -0800 +++ firestarter-1.0.3-non/scripts/non-routables 2006-02-02 04:59:49.000000000 -0800 @@ -10,20 +10,12 @@ 36.0.0.0/8 37.0.0.0/8 39.0.0.0/8 -41.0.0.0/8 42.0.0.0/8 49.0.0.0/8 50.0.0.0/8 -73.0.0.0/8 -74.0.0.0/8 -75.0.0.0/8 -76.0.0.0/8 77.0.0.0/8 78.0.0.0/8 79.0.0.0/8 -89.0.0.0/8 -90.0.0.0/8 -91.0.0.0/8 92.0.0.0/8 93.0.0.0/8 94.0.0.0/8 @@ -53,12 +45,6 @@ 118.0.0.0/8 119.0.0.0/8 120.0.0.0/8 -121.0.0.0/8 -122.0.0.0/8 -123.0.0.0/8 -124.0.0.0/8 -125.0.0.0/8 -126.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 @@ -77,8 +63,6 @@ 185.0.0.0/8 186.0.0.0/8 187.0.0.0/8 -189.0.0.0/8 -190.0.0.0/8 192.0.2.0/24 192.168.0.0/16 197.0.0.0/8 Index: firestarter.spec =================================================================== RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- firestarter.spec 30 Jan 2006 22:33:44 -0000 1.17 +++ firestarter.spec 2 Feb 2006 13:12:11 -0000 1.18 @@ -1,6 +1,6 @@ Name: firestarter Version: 1.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Firewall tool for GNOME Group: Applications/Internet @@ -11,7 +11,8 @@ #Source1: http://www.fs-security.com/docs/fs-manual.pdf Patch0: firestarter-1.0.3-pam.patch Patch1: firestarter-1.0.3-services.patch -Patch2: firestarter-1.0.3-nobrowser.patch +Patch2: firestarter-1.0.3-nobrowser.patch +Patch3: firestarter-1.0.3-nonroutable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -40,6 +41,7 @@ %patch0 -p1 -b .pam %patch1 -p1 -b .services %patch2 -p1 -b .nobrowser +%patch3 -p1 -b .nonroutable cp %{SOURCE1} ./fs-manual.pdf %build @@ -159,6 +161,10 @@ %changelog +* Thu Feb 02 2006 Michael A. Peters - 1.0.3-9 +- fix non routables per http://www.iana.org/assignments/ipv4-address-space +- fixes bug 179685 + * Mon Jan 30 2006 Michael A. Peters - 1.0.3-8 - fixed %post script for dhcp exit script (bug #160431) From fedora-extras-commits at redhat.com Thu Feb 2 13:13:44 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Feb 2006 08:13:44 -0500 Subject: rpms/fonttools/devel fonttools.spec,1.1,1.2 Message-ID: <200602021314.k12DEGU1022517@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22418 Modified Files: fonttools.spec Log Message: * Thu Feb 02 2006 Roozbeh Pournader - 2.0-0.4.20050624cvs - Provide ttx Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fonttools.spec 2 Feb 2006 13:02:30 -0000 1.1 +++ fonttools.spec 2 Feb 2006 13:13:43 -0000 1.2 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.3.%{alphatag}%{?dist} +Release: 0.4.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -17,6 +17,7 @@ Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-numeric +Provides: ttx %description TTX/FontTools is a tool for manipulating TrueType and OpenType fonts. It is @@ -75,6 +76,9 @@ %changelog +* Thu Feb 02 2006 Roozbeh Pournader - 2.0-0.4.20050624cvs +- Provide ttx + * Wed Feb 01 2006 Roozbeh Pournader - 2.0-0.3.20050624cvs - Use upstream snapshots, moving the difference into a patch - Change alphatag time to the latest change in CVS From fedora-extras-commits at redhat.com Thu Feb 2 13:38:02 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Thu, 2 Feb 2006 08:38:02 -0500 Subject: rpms/firestarter/FC-4 firestarter-1.0.3-nobrowser.patch, NONE, 1.1 firestarter-1.0.3-nonroutable.patch, NONE, 1.1 firestarter-1.0.3-services.patch, NONE, 1.1 firestarter.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200602021338.k12DcYML022788@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/firestarter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22756 Modified Files: firestarter.spec sources Added Files: firestarter-1.0.3-nobrowser.patch firestarter-1.0.3-nonroutable.patch firestarter-1.0.3-services.patch Log Message: Updates for FC4 firestarter-1.0.3-nobrowser.patch: --- NEW FILE firestarter-1.0.3-nobrowser.patch --- diff -ur firestarter-1.0.3/src/menus.c firestarter-1.0.3-patched/src/menus.c --- firestarter-1.0.3/src/menus.c 2005-01-29 07:32:08.000000000 -0500 +++ firestarter-1.0.3-patched/src/menus.c 2006-01-17 11:12:06.000000000 -0500 @@ -34,8 +34,6 @@ static GtkUIManager *ui_manager; -static void open_homepage (void); -static void open_manual (void); static void copy_selected (void); /* Normal items */ @@ -67,8 +65,6 @@ { "EditRule", FIRESTARTER_STOCK_EDIT, N_("_Edit Rule"), NULL, N_("Edit the selected rule"), policyview_edit_rule }, { "ApplyPolicy", GTK_STOCK_APPLY, N_("A_pply Policy"), NULL, N_("Apply the changes made the policy"), policyview_apply }, - { "OpenManual", GTK_STOCK_HELP, N_("Online Users' _Manual"), NULL, N_("Open the online users' manual in a browser"), open_manual }, - { "OpenHomepage", GTK_STOCK_HOME, N_("Firestarter _Homepage"), NULL, N_("Open the Firestarter homepage in a browser"), open_homepage }, { "ShowAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL, N_("About Firestarter"), G_CALLBACK (show_about) }, { "AllowInboundFrom", NULL, N_("Allow Connections From Source"), NULL, N_("Allow all connections from this source"), hitview_allow_host }, @@ -146,8 +142,6 @@ " " " " " " - " " - " " " " " " " " @@ -538,18 +532,6 @@ g_object_set (G_OBJECT (action), "sensitive", enabled, NULL); } -static void -open_homepage (void) -{ - gnome_url_show ("http://www.fs-security.com", NULL); -} - -static void -open_manual (void) -{ - gnome_url_show ("http://www.fs-security.com/docs/", NULL); -} - /* [ copy_selected ] * Copy the selection in the active view to the clipboard */ firestarter-1.0.3-nonroutable.patch: --- NEW FILE firestarter-1.0.3-nonroutable.patch --- diff -ur firestarter-1.0.3/scripts/non-routables firestarter-1.0.3-non/scripts/non-routables --- firestarter-1.0.3/scripts/non-routables 2005-01-29 04:32:09.000000000 -0800 +++ firestarter-1.0.3-non/scripts/non-routables 2006-02-02 04:59:49.000000000 -0800 @@ -10,20 +10,12 @@ 36.0.0.0/8 37.0.0.0/8 39.0.0.0/8 -41.0.0.0/8 42.0.0.0/8 49.0.0.0/8 50.0.0.0/8 -73.0.0.0/8 -74.0.0.0/8 -75.0.0.0/8 -76.0.0.0/8 77.0.0.0/8 78.0.0.0/8 79.0.0.0/8 -89.0.0.0/8 -90.0.0.0/8 -91.0.0.0/8 92.0.0.0/8 93.0.0.0/8 94.0.0.0/8 @@ -53,12 +45,6 @@ 118.0.0.0/8 119.0.0.0/8 120.0.0.0/8 -121.0.0.0/8 -122.0.0.0/8 -123.0.0.0/8 -124.0.0.0/8 -125.0.0.0/8 -126.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 @@ -77,8 +63,6 @@ 185.0.0.0/8 186.0.0.0/8 187.0.0.0/8 -189.0.0.0/8 -190.0.0.0/8 192.0.2.0/24 192.168.0.0/16 197.0.0.0/8 firestarter-1.0.3-services.patch: --- NEW FILE firestarter-1.0.3-services.patch --- diff -ur firestarter-1.0.3/src/service.c firestarter-1.0.3.patched/src/service.c --- firestarter-1.0.3/src/service.c 2005-01-29 04:32:08.000000000 -0800 +++ firestarter-1.0.3.patched/src/service.c 2006-01-17 04:34:43.000000000 -0800 @@ -22,7 +22,9 @@ } Service; Service user_services[] = { + {"APCUPSD", "3551"}, {"BitTorrent", "6881-6889"}, + {"CUPS", "631"}, {"DHCP", "67-68"}, {"DNS", "53"}, {"FTP", "20-21"}, Index: firestarter.spec =================================================================== RCS file: /cvs/extras/rpms/firestarter/FC-4/firestarter.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- firestarter.spec 2 Jun 2005 14:48:41 -0000 1.11 +++ firestarter.spec 2 Feb 2006 13:38:01 -0000 1.12 @@ -1,13 +1,18 @@ Name: firestarter Version: 1.0.3 -Release: 3 +Release: 9%{?dist} Summary: Firewall tool for GNOME Group: Applications/Internet License: GPL URL: http://firestarter.sourceforge.net Source0: http://download.sourceforge.net/firestarter/firestarter-1.0.3.tar.gz +Source1: 20050107-fs-manual.pdf +#Source1: http://www.fs-security.com/docs/fs-manual.pdf Patch0: firestarter-1.0.3-pam.patch +Patch1: firestarter-1.0.3-services.patch +Patch2: firestarter-1.0.3-nobrowser.patch +Patch3: firestarter-1.0.3-nonroutable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -34,7 +39,10 @@ %prep %setup -q %patch0 -p1 -b .pam - +%patch1 -p1 -b .services +%patch2 -p1 -b .nobrowser +%patch3 -p1 -b .nonroutable +cp %{SOURCE1} ./fs-manual.pdf %build %configure @@ -52,7 +60,7 @@ make install DESTDIR=${RPM_BUILD_ROOT} mv ${RPM_BUILD_ROOT}/%{_bindir}/firestarter ${RPM_BUILD_ROOT}/%{_sbindir} -ln -s %{_bindir}/consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/firestarter +ln -s consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/firestarter touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/firestarter/configuration touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/firestarter/events-filter-hosts @@ -115,34 +123,37 @@ %postun if [ "$1" = "0" ]; then if [ -e /etc/dhclient-exit-hooks ]; then - grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > /etc/dhclient-exit-hooks.tmp - mv /etc/dhclient-exit-hooks.tmp /etc/dhclient-exit-hooks + NEW_CONF=`mktemp -t firestarter.XXXXXX` + grep -v 'sh %{_sysconfdir}/firestarter/firestarter.sh start' < /etc/dhclient-exit-hooks > ${NEW_CONF} + cat ${NEW_CONF} > /etc/dhclient-exit-hooks fi fi %files -f %{name}.lang %defattr(-,root,root,-) -%doc README ChangeLog AUTHORS TODO COPYING CREDITS +%doc README ChangeLog AUTHORS TODO COPYING CREDITS fs-manual.pdf %attr(755,root,root) %{_sbindir}/firestarter %{_bindir}/firestarter -%config %{_initrddir}/firestarter +%{_initrddir}/firestarter %{_sysconfdir}/gconf/schemas/firestarter.schemas %{_sysconfdir}/pam.d/firestarter %{_sysconfdir}/security/console.apps/%{name} %dir %attr(700,root,root) %{_sysconfdir}/firestarter %dir %attr(700,root,root) %{_sysconfdir}/firestarter/inbound %dir %attr(700,root,root) %{_sysconfdir}/firestarter/outbound -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/configuration -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-hosts -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-ports -%config(missingok,noreplace) %attr(700,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firestarter.sh -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firewall -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/sysctl-tuning -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-pre -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-post -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/inbound/* -%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/outbound/* +# ghosted +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/configuration +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-hosts +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-ports +%ghost %config(missingok,noreplace) %attr(700,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firestarter.sh +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firewall +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/sysctl-tuning +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-pre +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-post +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/inbound/* +%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/outbound/* +# end ghosted %{_sysconfdir}/firestarter/non-routables %{_datadir}/applications/fedora-firestarter.desktop %{_datadir}/pixmaps/* @@ -150,6 +161,30 @@ %changelog +* Thu Feb 02 2006 Michael A. Peters - 1.0.3-9 +- fix non routables per http://www.iana.org/assignments/ipv4-address-space +- fixes bug 179685 + +* Mon Jan 30 2006 Michael A. Peters - 1.0.3-8 +- fixed %post script for dhcp exit script (bug #160431) + +* Tue Jan 17 2006 Michael A. Peters - 1.0.3-7 +- add CUPS and APCUPSD to services +- don't open browser window since it runs as root (bug #178040) +- add PDF documentation +- some spec file cleanup + +* Thu Aug 18 2005 Michael Schwendt - 1.0.3-6 +- rebuilt + +* Tue Jun 28 2005 Michael Schwendt +- remove work-around from 1.0.3-5 again, bug has been fixed + +* Sat Jun 25 2005 Michael Schwendt - 1.0.3-5 +- temporarily add BR libpng-devel to work-around a broken + cairo-devel package, which is pulled in and breaks the pkg-config + dependency chain (#161688) + * Thu Jun 2 2005 Michael Schwendt 1.0.3-3 - patch to remove hardcoded PAM module paths (#158929) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firestarter/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Jun 2005 14:46:10 -0000 1.8 +++ sources 2 Feb 2006 13:38:01 -0000 1.9 @@ -1 +1,2 @@ f46860a9e16dac4b693bd05f16370b03 firestarter-1.0.3.tar.gz +61b03e662802b885d5305bd225038010 20050107-fs-manual.pdf From fedora-extras-commits at redhat.com Thu Feb 2 13:55:22 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 2 Feb 2006 08:55:22 -0500 Subject: rpms/bittorrent/devel bittorrent.spec, 1.34, 1.35 btseed.init, 1.5, 1.6 bttrack.init, 1.4, 1.5 sources, 1.16, 1.17 .cvsignore, 1.16, 1.17 Message-ID: <200602021355.k12Dtst4023290@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23213 Modified Files: bittorrent.spec btseed.init bttrack.init sources .cvsignore Log Message: * Thu Feb 2 2006 Paul Howarth 4.4.0-1 - Update to 4.4.0 - Hardcode /usr/sbin in useradd dependency path - Update %description - GUI subpackage now requires pygtk2 >= 2.6.0 so no FC3 or RHEL4 build - Specify explicit path for runuser in initscripts - Merge /etc/sysconfig/{btseed,bttrack} into /etc/sysconfig/bittorrent - Merge /etc/logrotate.d/{btseed,bttrack} into /etc/logrotate.d/bittorrent - Fix initscript for bttrack to allow for pidfile creation - Ghost /var/run/bittorrent-tracker.pid so it gets deleted on package removal - Add comments in %prep - Remove shellbangs from python files to reduce rpmlint output - Replace $RPM_BUILD_ROOT with %{buildroot} (packager's personal preference) Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- bittorrent.spec 20 Dec 2005 16:56:24 -0000 1.34 +++ bittorrent.spec 2 Feb 2006 13:55:22 -0000 1.35 @@ -3,8 +3,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.4.0 +Release: 1%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -29,7 +29,7 @@ Provides: python-khashmir = %{version}-%{release} Obsoletes: python-khashmir < %{version}-%{release} -Requires(pre): %{_sbindir}/useradd +Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -37,16 +37,17 @@ Requires(postun): /sbin/service %description -BitTorrent is a tool for copying files from one machine to another. FTP -punishes sites for being popular: Since all uploading is done from one place, -a popular site needs big iron and big bandwidth. With BitTorrent, clients -automatically mirror files they download, making the publisher's burden almost -nothing. +BitTorrent is a tool for distributing files. It's extremely easy to use - +downloads are started by clicking on hyperlinks. Whenever more than one person +is downloading at once they send pieces of the file(s) to each other, thus +relieving the central server's bandwidth burden. Even with many simultaneous +downloads, the upload burden on the central server remains quite small, since +each new downloader introduces new upload capacity. %package gui Summary: GUI versions of the BitTorrent file transfer tool Group: Applications/Internet -Requires: pygtk2 +Requires: pygtk2 >= 2.6.0 Requires: %{name} = %{version}-%{release} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -75,42 +76,48 @@ %prep %setup -q -n BitTorrent-%{version} + +# Prevent phone-home new version check %patch0 -p1 + +# Our package is "bittorrent", not "BitTorrent" %{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \ BitTorrent/platform.py + +# Put public key in standard place %{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \ BitTorrent/NewVersion.py -%{__cat} <btseed.sysconfig -DIR=%{bt_dir} -OPTIONS="--max_upload_rate 350 --display_interval 300" -SEEDLOG=%{_localstatedir}/log/bittorrent/btseed.log -EOF +# Remove useless shellbangs +%{__sed} -i -e '/^#! *\/usr\/bin\/env python/d' BitTorrent/launchmanycore.py BitTorrent/makemetafile.py -%{__cat} <bttrack.sysconfig -PORT=6969 -DIR=%{bt_dir} -STATEFILE=%{bt_statedir}/bttrack -LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log -OPTIONS="--min_time_between_log_flushes 4.0 --show_names 1 --hupmonitor 1" +# Create options files for initscripts +%{__cat} <bittorrent.sysconfig +SEEDDIR=%{bt_dir} +SEEDOPTS="--max_upload_rate 350 --display_interval 300" +SEEDLOG=%{_localstatedir}/log/bittorrent/btseed.log +TRACKPORT=6969 +TRACKDIR=%{bt_dir} +TRACKSTATEFILE=%{bt_statedir}/bttrack +TRACKLOG=%{_localstatedir}/log/bittorrent/bttrack.log +TRACKOPTS="--min_time_between_log_flushes 4.0 --show_names 1 --hupmonitor 1" EOF -%{__cat} <btseed.logrotate +# Have the services' log files rotated +%{__cat} <bittorrent.logrotate %{_localstatedir}/log/bittorrent/btseed.log { notifempty missingok postrotate - /sbin/service btseed condrestart 2>/dev/null >/dev/null || true + /sbin/service btseed condrestart 2>/dev/null >/dev/null || : endscript } -EOF -%{__cat} <bttrack.logrotate %{_localstatedir}/log/bittorrent/bttrack.log { notifempty missingok postrotate - /sbin/service bttrack condrestart 2>/dev/null >/dev/null || true + /sbin/service bttrack condrestart 2>/dev/null >/dev/null || : endscript } EOF @@ -119,32 +126,32 @@ %{__python} setup.py build %install -%{__rm} -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} +%{__python} setup.py install -O1 --skip-build --root %{buildroot} /usr/bin/desktop-file-install --vendor %{desktopvendor} \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} -%{__install} -d $RPM_BUILD_ROOT%{bt_dir} -%{__install} -d $RPM_BUILD_ROOT%{bt_statedir} -%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent -%{__install} -d -m 755 $RPM_BUILD_ROOT%{pkidir}/bittorrent -%{__install} -m 0644 public.key $RPM_BUILD_ROOT%{pkidir}/bittorrent -%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png -%{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed -%{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack -%{__install} -m 0644 -D btseed.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/btseed -%{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack -%{__install} -m 0644 -D btseed.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btseed -%{__install} -m 0644 -D bttrack.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bttrack +%{__install} -d %{buildroot}%{bt_dir} +%{__install} -d %{buildroot}%{bt_statedir} +%{__install} -d %{buildroot}%{_localstatedir}/{run,log/bittorrent} +%{__install} -d %{buildroot}%{pkidir}/bittorrent +%{__install} -m 0644 public.key %{buildroot}%{pkidir}/bittorrent +%{__install} -m 0644 -D %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png +%{__install} -m 0755 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/rc.d/init.d/btseed +%{__install} -m 0755 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/rc.d/init.d/bttrack +%{__install} -m 0644 -D bittorrent.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/bittorrent +%{__install} -m 0644 -D bittorrent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/bittorrent # pidof doesn't find scripts with hyphenated names, so make some convenience links for initscripts -%{__ln_s} bittorrent-tracker $RPM_BUILD_ROOT%{_bindir}/bttrack -%{__ln_s} launchmany-console $RPM_BUILD_ROOT%{_bindir}/btseed +%{__ln_s} bittorrent-tracker %{buildroot}%{_bindir}/bttrack +%{__ln_s} launchmany-console %{buildroot}%{_bindir}/btseed +# ghost the tracker pidfile so it goes on package removal +: > %{buildroot}%{_localstatedir}/run/bittorrent-tracker.pid %{find_lang} bittorrent %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %pre /usr/sbin/useradd -r -s /sbin/nologin -d %{_localstatedir}/spool/bittorrent \ @@ -179,7 +186,7 @@ [ -x /usr/bin/gtk-update-icon-cache ] && /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %files -f bittorrent.lang -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc README.txt credits.txt credits-l10n.txt LICENSE.txt TRACKERLESS.txt %{_bindir}/bittorrent-console %{_bindir}/bittorrent-curses @@ -203,22 +210,35 @@ %attr(-,torrent,torrent) %dir %{bt_dir} %attr(-,torrent,torrent) %dir %{bt_statedir} %attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent +%ghost %{_localstatedir}/run/bittorrent-tracker.pid %{_sysconfdir}/rc.d/init.d/btseed %{_sysconfdir}/rc.d/init.d/bttrack -%config(noreplace) %{_sysconfdir}/logrotate.d/btseed -%config(noreplace) %{_sysconfdir}/logrotate.d/bttrack -%config(noreplace) %{_sysconfdir}/sysconfig/btseed -%config(noreplace) %{_sysconfdir}/sysconfig/bttrack +%config(noreplace) %{_sysconfdir}/logrotate.d/bittorrent +%config(noreplace) %{_sysconfdir}/sysconfig/bittorrent %files gui -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %{_bindir}/bittorrent %{_bindir}/maketorrent -%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop -%{_datadir}/pixmaps/%{name}-%{version} +%{_datadir}/pixmaps/bittorrent-%{version} %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png +%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop %changelog +* Thu Feb 2 2006 Paul Howarth 4.4.0-1 +- Update to 4.4.0 +- Hardcode /usr/sbin in useradd dependency path +- Update %%description +- GUI subpackage now requires pygtk2 >= 2.6.0 so no FC3 or RHEL4 build +- Specify explicit path for runuser in initscripts +- Merge /etc/sysconfig/{btseed,bttrack} into /etc/sysconfig/bittorrent +- Merge /etc/logrotate.d/{btseed,bttrack} into /etc/logrotate.d/bittorrent +- Fix initscript for bttrack to allow for pidfile creation +- Ghost /var/run/bittorrent-tracker.pid so it gets deleted on package removal +- Add comments in %%prep +- Remove shellbangs from python files to reduce rpmlint output +- Replace $RPM_BUILD_ROOT with %%{buildroot} (packager's personal preference) + * Tue Dec 20 2005 Paul Howarth 4.2.2-2 - Add patch to prevent phoning home for new version checks Index: btseed.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/btseed.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- btseed.init 13 Oct 2005 11:49:01 -0000 1.5 +++ btseed.init 2 Feb 2006 13:55:22 -0000 1.6 @@ -1,10 +1,10 @@ #!/bin/bash # # chkconfig: - 16 84 -# description: Start up seed clients for BitTorrennt +# description: Start up seed clients for BitTorrent # # processname: btseed -# config: /etc/sysconfig/btseed +# config: /etc/sysconfig/bittorrent # source function library . /etc/rc.d/init.d/functions @@ -16,22 +16,23 @@ [ "${NETWORKING}" = "no" ] && exit 0 # default directory for torrents to seed -DIR=/srv/bittorrent/data +SEEDDIR=/srv/bittorrent/data # default log file SEEDLOG=/var/log/btseed.log # source the config -. /etc/sysconfig/btseed +. /etc/sysconfig/bittorrent RETVAL=0 prog="/usr/bin/btseed" btuser="torrent" +btgroup="torrent" case "$1" in start) echo -n $"Starting BitTorrent seed client: " - runuser -s /bin/sh -c "$prog $OPTIONS $DIR" $btuser >> $SEEDLOG 2>&1 & + /sbin/runuser -s /bin/sh -c "$prog $SEEDOPTS $SEEDDIR" $btuser >> $SEEDLOG 2>&1 & disown -ar usleep 500000 status btseed &> /dev/null && echo_success || echo_failure Index: bttrack.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bttrack.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bttrack.init 18 Aug 2005 11:39:13 -0000 1.4 +++ bttrack.init 2 Feb 2006 13:55:22 -0000 1.5 @@ -1,10 +1,10 @@ #!/bin/bash # # chkconfig: - 16 84 -# description: Start up tracker for BitTorrennt +# description: Start up tracker for BitTorrent # # processname: bttrack -# config: /etc/sysconfig/bttrack +# config: /etc/sysconfig/bittorrent # source function library . /etc/rc.d/init.d/functions @@ -13,25 +13,29 @@ [ "${NETWORKING}" = "no" ] && exit 0 # defaults -PORT=6969 -STATEFILE=/srv/bittorrent/state/bttrack -OPTIONS= -LOGFILE=/var/log/bittorrent/bttrack.log +TRACKPORT=6969 +TRACKSTATEFILE=/srv/bittorrent/state/bttrack +TRACKOPTS= +TRACKLOG=/var/log/bittorrent/bttrack.log # directory of torrents that the tracker is allowed to serve -DIR="/srv/bittorrent/data" +TRACKDIR="/srv/bittorrent/data" # source the config -. /etc/sysconfig/bttrack +. /etc/sysconfig/bittorrent RETVAL=0 prog="/usr/bin/bttrack" btuser="torrent" +btgroup="torrent" case "$1" in start) echo -n $"Starting BitTorrent tracker: " - runuser -s /bin/sh -c "$prog --port $PORT --dfile $STATEFILE --logfile $LOGFILE \ - $OPTIONS --allowed_dir $DIR" $btuser &> /dev/null & + : > /var/run/bittorrent-tracker.pid + /bin/chown $btuser:$btgroup /var/run/bittorrent-tracker.pid + /sbin/runuser -s /bin/sh -c "$prog --port $TRACKPORT \ + --dfile $TRACKSTATEFILE --logfile $TRACKLOG $TRACKOPTS \ + --allowed_dir $TRACKDIR" $btuser &> /dev/null & disown -ar usleep 500000 status bttrack &> /dev/null && echo_success || echo_failure Index: sources =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 19 Dec 2005 10:06:12 -0000 1.16 +++ sources 2 Feb 2006 13:55:22 -0000 1.17 @@ -1 +1 @@ -2a85715b8ef0335ecc9e8ad91860231b BitTorrent-4.2.2.tar.gz +74d4b48202c28f0b27e989b6d5f5b214 BitTorrent-4.4.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 19 Dec 2005 10:06:12 -0000 1.16 +++ .cvsignore 2 Feb 2006 13:55:22 -0000 1.17 @@ -1 +1 @@ -BitTorrent-4.2.2.tar.gz +BitTorrent-4.4.0.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 14:21:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 09:21:07 -0500 Subject: rpms/perl-Convert-ASCII-Armour/FC-3 perl-Convert-ASCII-Armour.spec, 1.1, 1.2 Message-ID: <200602021421.k12ELdYl025506@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25459/FC-3 Modified Files: perl-Convert-ASCII-Armour.spec Log Message: Better Summary (BZ #168610). Index: perl-Convert-ASCII-Armour.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/FC-3/perl-Convert-ASCII-Armour.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Convert-ASCII-Armour.spec 26 Jan 2006 21:25:19 -0000 1.1 +++ perl-Convert-ASCII-Armour.spec 2 Feb 2006 14:21:07 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Convert-ASCII-Armour Version: 1.4 -Release: 2%{?dist} -Summary: Convert::ASCII::Armour Perl module +Release: 3%{?dist} +Summary: Convert binary octets into ASCII armoured messages License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-ASCII-Armour/ @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 1.4-3 +- Better Summary (BZ #168610). + * Sat Sep 17 2005 Steven Pritchard 1.4-2 - Minor spec cleanup. - Remove explicit dependencies on core modules. From fedora-extras-commits at redhat.com Thu Feb 2 14:21:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 09:21:13 -0500 Subject: rpms/perl-Convert-ASCII-Armour/FC-4 perl-Convert-ASCII-Armour.spec, 1.1, 1.2 Message-ID: <200602021421.k12ELjAA025509@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25459/FC-4 Modified Files: perl-Convert-ASCII-Armour.spec Log Message: Better Summary (BZ #168610). Index: perl-Convert-ASCII-Armour.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/FC-4/perl-Convert-ASCII-Armour.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Convert-ASCII-Armour.spec 26 Jan 2006 21:25:19 -0000 1.1 +++ perl-Convert-ASCII-Armour.spec 2 Feb 2006 14:21:12 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Convert-ASCII-Armour Version: 1.4 -Release: 2%{?dist} -Summary: Convert::ASCII::Armour Perl module +Release: 3%{?dist} +Summary: Convert binary octets into ASCII armoured messages License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-ASCII-Armour/ @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 1.4-3 +- Better Summary (BZ #168610). + * Sat Sep 17 2005 Steven Pritchard 1.4-2 - Minor spec cleanup. - Remove explicit dependencies on core modules. From fedora-extras-commits at redhat.com Thu Feb 2 14:21:18 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 09:21:18 -0500 Subject: rpms/perl-Convert-ASCII-Armour/devel perl-Convert-ASCII-Armour.spec, 1.1, 1.2 Message-ID: <200602021421.k12ELoV9025512@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25459/devel Modified Files: perl-Convert-ASCII-Armour.spec Log Message: Better Summary (BZ #168610). Index: perl-Convert-ASCII-Armour.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel/perl-Convert-ASCII-Armour.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Convert-ASCII-Armour.spec 26 Jan 2006 21:25:19 -0000 1.1 +++ perl-Convert-ASCII-Armour.spec 2 Feb 2006 14:21:18 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Convert-ASCII-Armour Version: 1.4 -Release: 2%{?dist} -Summary: Convert::ASCII::Armour Perl module +Release: 3%{?dist} +Summary: Convert binary octets into ASCII armoured messages License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-ASCII-Armour/ @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 1.4-3 +- Better Summary (BZ #168610). + * Sat Sep 17 2005 Steven Pritchard 1.4-2 - Minor spec cleanup. - Remove explicit dependencies on core modules. From fedora-extras-commits at redhat.com Thu Feb 2 14:24:34 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 2 Feb 2006 09:24:34 -0500 Subject: rpms/kile/devel kile.spec,1.21,1.22 Message-ID: <200602021425.k12EP6B4025673@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25645 Modified Files: kile.spec Log Message: drop extraneous Reqs Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- kile.spec 15 Dec 2005 17:52:41 -0000 1.21 +++ kile.spec 2 Feb 2006 14:24:34 -0000 1.22 @@ -11,8 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils BuildRequires: qt-devel >= 1:3.3 BuildRequires: kdelibs-devel >= 6:3.3 From fedora-extras-commits at redhat.com Thu Feb 2 14:55:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Feb 2006 09:55:44 -0500 Subject: rpms/perl-Module-CoreList/FC-3 .cvsignore, 1.6, 1.7 perl-Module-CoreList.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200602021456.k12EuH0a026179@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-CoreList/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26056/FC-3 Modified Files: .cvsignore perl-Module-CoreList.spec sources Log Message: Update to 2.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Jun 2005 09:58:36 -0000 1.6 +++ .cvsignore 2 Feb 2006 14:55:44 -0000 1.7 @@ -1 +1 @@ -Module-CoreList-2.02.tar.gz +Module-CoreList-2.04.tar.gz Index: perl-Module-CoreList.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-3/perl-Module-CoreList.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Module-CoreList.spec 3 Jun 2005 09:58:36 -0000 1.5 +++ perl-Module-CoreList.spec 2 Feb 2006 14:55:44 -0000 1.6 @@ -1,18 +1,18 @@ Name: perl-Module-CoreList -Version: 2.02 +Version: 2.04 Release: 1%{?dist} Summary: Perl core modules indexed by perl versions Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-CoreList/ -Source0: http://www.cpan.org/authors/id/R/RG/RGARCIA/Module-CoreList-2.02.tar.gz +Source0: http://www.cpan.org/authors/id/R/RG/RGARCIA/Module-CoreList-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Test::More) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Test::Pod) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::CoreList contains the hash of hashes %Module::CoreList::version, @@ -39,7 +39,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -57,15 +57,24 @@ %changelog +* Thu Feb 2 2006 Jose Pedro Oliveira - 2.04-1 +- Update to 2.04. + * Fri Jun 3 2005 Jose Pedro Oliveira - 2.02-1 - Update to 2.02. -* Sun Apr 24 2005 Jose Pedro Oliveira - 2.01-1 +* Sat May 14 2005 Jose Pedro Oliveira - 2.01-3 +- Add dist tag. + +* Sun Apr 24 2005 Jose Pedro Oliveira - 2.01-2 - Update to 2.01. -* Sun Apr 10 2005 Jose Pedro Oliveira - 2.00-1 +* Sun Apr 10 2005 Jose Pedro Oliveira - 2.00-2 - Update to 2.00. +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Tue Apr 05 2005 Jose Pedro Oliveira - 1.99-1 - Update to 1.99. - Module::CoreList is now a core module (perl >= 5.9.2). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Jun 2005 09:58:36 -0000 1.6 +++ sources 2 Feb 2006 14:55:44 -0000 1.7 @@ -1 +1 @@ -3190e2bee70bc146a25e2798691fcf9a Module-CoreList-2.02.tar.gz +1bb36ff429224faa5fb72a8b45ee7af2 Module-CoreList-2.04.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 14:55:50 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Feb 2006 09:55:50 -0500 Subject: rpms/perl-Module-CoreList/FC-4 .cvsignore, 1.6, 1.7 perl-Module-CoreList.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200602021456.k12EuMlA026189@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-CoreList/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26056/FC-4 Modified Files: .cvsignore perl-Module-CoreList.spec sources Log Message: Update to 2.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Jun 2005 09:58:36 -0000 1.6 +++ .cvsignore 2 Feb 2006 14:55:50 -0000 1.7 @@ -1 +1 @@ -Module-CoreList-2.02.tar.gz +Module-CoreList-2.04.tar.gz Index: perl-Module-CoreList.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/perl-Module-CoreList.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Module-CoreList.spec 3 Jun 2005 09:58:36 -0000 1.8 +++ perl-Module-CoreList.spec 2 Feb 2006 14:55:50 -0000 1.9 @@ -1,18 +1,18 @@ Name: perl-Module-CoreList -Version: 2.02 +Version: 2.04 Release: 1%{?dist} Summary: Perl core modules indexed by perl versions Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-CoreList/ -Source0: http://www.cpan.org/authors/id/R/RG/RGARCIA/Module-CoreList-2.02.tar.gz +Source0: http://www.cpan.org/authors/id/R/RG/RGARCIA/Module-CoreList-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Test::More) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Test::Pod) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::CoreList contains the hash of hashes %Module::CoreList::version, @@ -39,7 +39,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -57,6 +57,9 @@ %changelog +* Thu Feb 2 2006 Jose Pedro Oliveira - 2.04-1 +- Update to 2.04. + * Fri Jun 3 2005 Jose Pedro Oliveira - 2.02-1 - Update to 2.02. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Jun 2005 09:58:36 -0000 1.6 +++ sources 2 Feb 2006 14:55:50 -0000 1.7 @@ -1 +1 @@ -3190e2bee70bc146a25e2798691fcf9a Module-CoreList-2.02.tar.gz +1bb36ff429224faa5fb72a8b45ee7af2 Module-CoreList-2.04.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 14:55:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Feb 2006 09:55:56 -0500 Subject: rpms/perl-Module-CoreList/devel .cvsignore, 1.6, 1.7 perl-Module-CoreList.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200602021456.k12EuSQc026194@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26056/devel Modified Files: .cvsignore perl-Module-CoreList.spec sources Log Message: Update to 2.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Jun 2005 09:58:41 -0000 1.6 +++ .cvsignore 2 Feb 2006 14:55:56 -0000 1.7 @@ -1 +1 @@ -Module-CoreList-2.02.tar.gz +Module-CoreList-2.04.tar.gz Index: perl-Module-CoreList.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/perl-Module-CoreList.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Module-CoreList.spec 3 Jun 2005 09:58:41 -0000 1.8 +++ perl-Module-CoreList.spec 2 Feb 2006 14:55:56 -0000 1.9 @@ -1,18 +1,18 @@ Name: perl-Module-CoreList -Version: 2.02 +Version: 2.04 Release: 1%{?dist} Summary: Perl core modules indexed by perl versions Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-CoreList/ -Source0: http://www.cpan.org/authors/id/R/RG/RGARCIA/Module-CoreList-2.02.tar.gz +Source0: http://www.cpan.org/authors/id/R/RG/RGARCIA/Module-CoreList-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Test::More) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Test::Pod) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::CoreList contains the hash of hashes %Module::CoreList::version, @@ -39,7 +39,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -57,6 +57,9 @@ %changelog +* Thu Feb 2 2006 Jose Pedro Oliveira - 2.04-1 +- Update to 2.04. + * Fri Jun 3 2005 Jose Pedro Oliveira - 2.02-1 - Update to 2.02. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Jun 2005 09:58:41 -0000 1.6 +++ sources 2 Feb 2006 14:55:56 -0000 1.7 @@ -1 +1 @@ -3190e2bee70bc146a25e2798691fcf9a Module-CoreList-2.02.tar.gz +1bb36ff429224faa5fb72a8b45ee7af2 Module-CoreList-2.04.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 14:57:37 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 09:57:37 -0500 Subject: rpms/koffice/devel koffice.spec,1.22,1.23 Message-ID: <200602021458.k12Ew9UV026217@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26200 Modified Files: koffice.spec Log Message: - more BR fixes Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- koffice.spec 2 Feb 2006 12:47:27 -0000 1.22 +++ koffice.spec 2 Feb 2006 14:57:36 -0000 1.23 @@ -53,7 +53,13 @@ BuildRequires: aspell-devel BuildRequires: libacl-devel BuildRequires: libxslt-devel +# new with 1.4.90 BuildRequires: OpenEXR-devel +BuildRequires: ruby-devel +BuildRequires: libexif-devel +BuildRequires: mesa-libGL-devel mesa-libGLU-devel +BuildRequires: libXi-devel +BuildRequires: readline-devel %description KOffice - Integrated Office Suite From fedora-extras-commits at redhat.com Thu Feb 2 15:03:29 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 2 Feb 2006 10:03:29 -0500 Subject: owners owners.list,1.596,1.597 Message-ID: <200602021504.k12F41e5028206@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28183 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.596 retrieving revision 1.597 diff -u -r1.596 -r1.597 --- owners.list 2 Feb 2006 12:47:44 -0000 1.596 +++ owners.list 2 Feb 2006 15:03:28 -0000 1.597 @@ -211,7 +211,7 @@ Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|fftw2|Fast Fourier Transform library|jamatos at fc.up.pt|extras-qa at fedoraproject.org| -Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| +Fedora Extras|fftw|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Feb 2 16:33:56 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 2 Feb 2006 11:33:56 -0500 Subject: rpms/ginac/devel ginac.spec,1.2,1.3 Message-ID: <200602021634.k12GYSpJ030644@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30627 Modified Files: ginac.spec Log Message: Update URL and fix unpackaged files. Index: ginac.spec =================================================================== RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ginac.spec 31 Oct 2005 23:23:57 -0000 1.2 +++ ginac.spec 2 Feb 2006 16:33:55 -0000 1.3 @@ -6,7 +6,7 @@ Group: System Environment/Libraries License: GPL URL: http://www.ginac.de/ -Source0: ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/%{name}-%{version}.tar.bz2 +Source0: http://www.ginac.de/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -86,24 +86,29 @@ %files devel %defattr(-,root,root) +%doc %{_infodir}/*.info* +%doc %{_mandir}/man?/ginac-config.1* %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/ginac.pc %{_includedir}/ginac -%{_infodir}/*.info* -%{_mandir}/man1/ginac-config.1* %{_bindir}/ginac-config %{_datadir}/aclocal/ginac.m4 %exclude %{_libdir}/*.la +%exclude %{_infodir}/dir %files utils %defattr(-,root,root) %{_bindir}/ginsh %{_bindir}/viewgar -%{_mandir}/man1/ginsh.1* -%{_mandir}/man1/viewgar.1* +%{_mandir}/man?/ginsh.1* +%{_mandir}/man?/viewgar.1* %changelog +* Wed Feb 1 2006 Quentin Spencer 1.3.3-2 +- Exclude /usr/share/info/dir from package. +- New URL. + * Mon Oct 31 2005 Quentin Spencer 1.3.3-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Feb 2 16:37:30 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 2 Feb 2006 11:37:30 -0500 Subject: rpms/ginac/devel ginac.spec,1.3,1.4 Message-ID: <200602021638.k12Gc2uN030711@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30691 Modified Files: ginac.spec Log Message: Forgot to update release. Index: ginac.spec =================================================================== RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ginac.spec 2 Feb 2006 16:33:55 -0000 1.3 +++ ginac.spec 2 Feb 2006 16:37:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: ginac Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for symbolic calculations Group: System Environment/Libraries From fedora-extras-commits at redhat.com Thu Feb 2 16:41:15 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 11:41:15 -0500 Subject: rpms/koffice/devel koffice.spec,1.23,1.24 Message-ID: <200602021641.k12Gfmwf030764@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30745 Modified Files: koffice.spec Log Message: - more BR's Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- koffice.spec 2 Feb 2006 14:57:36 -0000 1.23 +++ koffice.spec 2 Feb 2006 16:41:15 -0000 1.24 @@ -55,9 +55,9 @@ BuildRequires: libxslt-devel # new with 1.4.90 BuildRequires: OpenEXR-devel -BuildRequires: ruby-devel +BuildRequires: ruby ruby-devel BuildRequires: libexif-devel -BuildRequires: mesa-libGL-devel mesa-libGLU-devel +BuildRequires: libGL-devel libGLU-devel BuildRequires: libXi-devel BuildRequires: readline-devel From fedora-extras-commits at redhat.com Thu Feb 2 16:58:09 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 2 Feb 2006 11:58:09 -0500 Subject: rpms/ginac/devel ginac.spec,1.4,1.5 Message-ID: <200602021658.k12GwfxE030879@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30861 Modified Files: ginac.spec Log Message: Remove static libs. Index: ginac.spec =================================================================== RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ginac.spec 2 Feb 2006 16:37:29 -0000 1.4 +++ ginac.spec 2 Feb 2006 16:58:09 -0000 1.5 @@ -86,14 +86,14 @@ %files devel %defattr(-,root,root) -%doc %{_infodir}/*.info* -%doc %{_mandir}/man?/ginac-config.1* -%{_libdir}/*.a +%{_infodir}/*.info* +%{_mandir}/man?/ginac-config.1* %{_libdir}/*.so %{_libdir}/pkgconfig/ginac.pc %{_includedir}/ginac %{_bindir}/ginac-config %{_datadir}/aclocal/ginac.m4 +%exclude %{_libdir}/*.a %exclude %{_libdir}/*.la %exclude %{_infodir}/dir @@ -108,6 +108,7 @@ * Wed Feb 1 2006 Quentin Spencer 1.3.3-2 - Exclude /usr/share/info/dir from package. - New URL. +- Exclude static libs. * Mon Oct 31 2005 Quentin Spencer 1.3.3-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Feb 2 17:07:25 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 2 Feb 2006 12:07:25 -0500 Subject: rpms/ginac/FC-4 ginac.spec,1.2,1.3 Message-ID: <200602021708.k12H800o032757@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740 Modified Files: ginac.spec Log Message: Exclude static libs and /usr/share/info/dir. Index: ginac.spec =================================================================== RCS file: /cvs/extras/rpms/ginac/FC-4/ginac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ginac.spec 31 Oct 2005 23:22:22 -0000 1.2 +++ ginac.spec 2 Feb 2006 17:07:25 -0000 1.3 @@ -1,6 +1,6 @@ Name: ginac Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for symbolic calculations Group: System Environment/Libraries @@ -86,7 +86,6 @@ %files devel %defattr(-,root,root) -%{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/ginac.pc %{_includedir}/ginac @@ -94,7 +93,9 @@ %{_mandir}/man1/ginac-config.1* %{_bindir}/ginac-config %{_datadir}/aclocal/ginac.m4 +%exclude %{_libdir}/*.a %exclude %{_libdir}/*.la +%exclude %{_infodir}/dir %files utils %defattr(-,root,root) @@ -104,6 +105,9 @@ %{_mandir}/man1/viewgar.1* %changelog +* Thu Feb 2 2006 Quentin Spencer 1.3.3-2 +- Exclude static libs and /usr/share/info/dir from package. + * Mon Oct 31 2005 Quentin Spencer 1.3.3-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Feb 2 17:08:06 2006 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Thu, 2 Feb 2006 12:08:06 -0500 Subject: owners owners.list,1.597,1.598 Message-ID: <200602021708.k12H8fm0000313@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32763 Modified Files: owners.list Log Message: fix oops Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.597 retrieving revision 1.598 diff -u -r1.597 -r1.598 --- owners.list 2 Feb 2006 15:03:28 -0000 1.597 +++ owners.list 2 Feb 2006 17:08:06 -0000 1.598 @@ -228,7 +228,7 @@ Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|fontforge|An outline and bitmap font editor|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|fonts-hebrew-fancy|Fancy Hebrew fonts|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| -Fedora Extras|fonttools|A tool to convert True/OpenType fonts to XML and back|roozbeh at farsiweb.info|extras-qa at fedoraproject| +Fedora Extras|fonttools|A tool to convert True/OpenType fonts to XML and back|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|foremost|Program that recovers files by carving them from a raw disk|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|fortune-firefly|An addon of Firefly quotes for fortune-mod|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Feb 2 17:14:44 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Thu, 2 Feb 2006 12:14:44 -0500 Subject: rpms/liboil/FC-3 liboil.spec,1.2,1.3 Message-ID: <200602021715.k12HFGCR000359@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboil/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv340/FC-3 Modified Files: liboil.spec Log Message: update to 0.3.6 Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-3/liboil.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liboil.spec 14 Nov 2005 09:30:18 -0000 1.2 +++ liboil.spec 2 Feb 2006 17:14:44 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.5 -Release: 3%{?dist} +Version: 0.3.6 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -77,6 +77,9 @@ %changelog +* Thu Feb 02 2006 Thomas Vander Stichele 0.3.6-1 +- update to 0.3.6 + * Mon Nov 14 2005 Matthias Saou 0.3.5-3 - Sync spec files across branches. - Parallel make seems to have worked for 0.3.5 on devel, but just in case... From fedora-extras-commits at redhat.com Thu Feb 2 17:30:32 2006 From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme)) Date: Thu, 2 Feb 2006 12:30:32 -0500 Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.10.1-clawguide.patch, 1.1, 1.2 nethack-vultures.spec, 1.18, 1.19 Message-ID: <200602021731.k12HV4nY000463@cvs-int.fedora.redhat.com> Author: meme Update of /cvs/extras/rpms/nethack-vultures/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv422/FC-4 Modified Files: nethack-vultures-1.10.1-clawguide.patch nethack-vultures.spec Log Message: Added in a workaround for a util-linux bug in building the guidebook. nethack-vultures-1.10.1-clawguide.patch: Index: nethack-vultures-1.10.1-clawguide.patch =================================================================== RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.10.1-clawguide.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nethack-vultures-1.10.1-clawguide.patch 22 Nov 2005 02:16:56 -0000 1.1 +++ nethack-vultures-1.10.1-clawguide.patch 2 Feb 2006 17:30:31 -0000 1.2 @@ -5,7 +5,7 @@ # GUIDECMD = type Guidebook.txt # The following work better with groff-1.18, eg on Linux -# GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD) -+GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD) ++GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD) | cat # GUIDECMD = tbl tmac.n Guidebook.mn | groff -Wall -mtty-char -Tascii -P-u -P-b -GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD) +# GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD) Index: nethack-vultures.spec =================================================================== RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nethack-vultures.spec 8 Jan 2006 16:31:59 -0000 1.18 +++ nethack-vultures.spec 2 Feb 2006 17:30:31 -0000 1.19 @@ -1,6 +1,6 @@ Name: nethack-vultures Version: 1.11.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NetHack - Vulture's Eye and Vulture's Claw Group: Amusements/Games @@ -164,6 +164,9 @@ %changelog +* Sun Feb 02 2006 Frank Arnold - 1.11.2-4 +- Got a working plague build by working around util-linux bug #176441. + * Sun Jan 08 2006 Karen Pease - 1.11.2-3 - To fix a strange error on the plague server, added a req for util-linux. From fedora-extras-commits at redhat.com Thu Feb 2 17:30:37 2006 From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme)) Date: Thu, 2 Feb 2006 12:30:37 -0500 Subject: rpms/nethack-vultures/devel nethack-vultures-1.10.1-clawguide.patch, 1.1, 1.2 nethack-vultures.spec, 1.18, 1.19 Message-ID: <200602021731.k12HVAW6000467@cvs-int.fedora.redhat.com> Author: meme Update of /cvs/extras/rpms/nethack-vultures/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv422/devel Modified Files: nethack-vultures-1.10.1-clawguide.patch nethack-vultures.spec Log Message: Added in a workaround for a util-linux bug in building the guidebook. nethack-vultures-1.10.1-clawguide.patch: Index: nethack-vultures-1.10.1-clawguide.patch =================================================================== RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.10.1-clawguide.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nethack-vultures-1.10.1-clawguide.patch 22 Nov 2005 02:16:56 -0000 1.1 +++ nethack-vultures-1.10.1-clawguide.patch 2 Feb 2006 17:30:37 -0000 1.2 @@ -5,7 +5,7 @@ # GUIDECMD = type Guidebook.txt # The following work better with groff-1.18, eg on Linux -# GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD) -+GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD) ++GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD) | cat # GUIDECMD = tbl tmac.n Guidebook.mn | groff -Wall -mtty-char -Tascii -P-u -P-b -GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD) +# GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD) Index: nethack-vultures.spec =================================================================== RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nethack-vultures.spec 8 Jan 2006 16:32:05 -0000 1.18 +++ nethack-vultures.spec 2 Feb 2006 17:30:37 -0000 1.19 @@ -1,6 +1,6 @@ Name: nethack-vultures Version: 1.11.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NetHack - Vulture's Eye and Vulture's Claw Group: Amusements/Games @@ -164,6 +164,9 @@ %changelog +* Sun Feb 02 2006 Frank Arnold - 1.11.2-4 +- Got a working plague build by working around util-linux bug #176441. + * Sun Jan 08 2006 Karen Pease - 1.11.2-3 - To fix a strange error on the plague server, added a req for util-linux. From fedora-extras-commits at redhat.com Thu Feb 2 18:25:21 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 2 Feb 2006 13:25:21 -0500 Subject: rpms/liferea/FC-4 .cvsignore, 1.19, 1.20 liferea.spec, 1.24, 1.25 sources, 1.20, 1.21 Message-ID: <200602021825.k12IPrfw003729@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3693 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu Feb 2 2006 Brian Pepple - 1.0.3-1 - Update to 1.0.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 26 Jan 2006 21:47:48 -0000 1.19 +++ .cvsignore 2 Feb 2006 18:25:21 -0000 1.20 @@ -1 +1 @@ -liferea-1.0.2.tar.gz +liferea-1.0.3.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- liferea.spec 26 Jan 2006 21:47:48 -0000 1.24 +++ liferea.spec 2 Feb 2006 18:25:21 -0000 1.25 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Thu Feb 2 2006 Brian Pepple - 1.0.3-1 +- Update to 1.0.3. + * Thu Jan 26 2006 Brian Pepple - 1.0.2-1 - Update to 1.0.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 26 Jan 2006 21:47:48 -0000 1.20 +++ sources 2 Feb 2006 18:25:21 -0000 1.21 @@ -1 +1 @@ -45cd555c60ce7f8a2eda4b776118e939 liferea-1.0.2.tar.gz +40232e6884e4ae9628916868a9a9c828 liferea-1.0.3.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 19:18:23 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Thu, 2 Feb 2006 14:18:23 -0500 Subject: rpms/liboil/FC-3 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200602021918.k12JItCT005944@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboil/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5912 Modified Files: .cvsignore sources Log Message: update to 0.3.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Nov 2005 09:30:18 -0000 1.3 +++ .cvsignore 2 Feb 2006 19:18:22 -0000 1.4 @@ -1 +1 @@ -liboil-0.3.5.tar.gz +liboil-0.3.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Nov 2005 09:30:18 -0000 1.3 +++ sources 2 Feb 2006 19:18:22 -0000 1.4 @@ -1 +1 @@ -f365f0a4cc31b2ff029e37deccb09ff6 liboil-0.3.5.tar.gz +a36b2d9cc71d75d814d7bdca2263290f liboil-0.3.6.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 19:19:51 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Thu, 2 Feb 2006 14:19:51 -0500 Subject: rpms/liboil/FC-3 liboil.spec,1.3,1.4 Message-ID: <200602021920.k12JKOe9006030@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboil/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6013 Modified Files: liboil.spec Log Message: update to 0.3.6 Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-3/liboil.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- liboil.spec 2 Feb 2006 17:14:44 -0000 1.3 +++ liboil.spec 2 Feb 2006 19:19:51 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil Version: 0.3.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -77,7 +77,7 @@ %changelog -* Thu Feb 02 2006 Thomas Vander Stichele 0.3.6-1 +* Thu Feb 02 2006 Thomas Vander Stichele 0.3.6-2 - update to 0.3.6 * Mon Nov 14 2005 Matthias Saou 0.3.5-3 From fedora-extras-commits at redhat.com Thu Feb 2 19:44:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Feb 2006 14:44:02 -0500 Subject: rpms/perl-WWW-Mechanize/devel .cvsignore, 1.4, 1.5 perl-WWW-Mechanize.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200602021944.k12JiYn3006207@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-WWW-Mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6186 Modified Files: .cvsignore perl-WWW-Mechanize.spec sources Log Message: Update to 1.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Nov 2005 20:35:18 -0000 1.4 +++ .cvsignore 2 Feb 2006 19:44:01 -0000 1.5 @@ -1 +1 @@ -WWW-Mechanize-1.16.tar.gz +WWW-Mechanize-1.18.tar.gz Index: perl-WWW-Mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/devel/perl-WWW-Mechanize.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-WWW-Mechanize.spec 10 Nov 2005 20:35:18 -0000 1.5 +++ perl-WWW-Mechanize.spec 2 Feb 2006 19:44:01 -0000 1.6 @@ -2,8 +2,12 @@ # Rebuild switch: # --with livetests enable live tests # + +%define livetests 0 +%{?_with_livetests:%define livetests 1} + Name: perl-WWW-Mechanize -Version: 1.16 +Version: 1.18 Release: 1%{?dist} Summary: Automates web page form & link interaction @@ -20,7 +24,7 @@ BuildRequires: perl(HTML::TokeParser), perl(LWP::UserAgent), perl(URI::URL) %{?_with_livetests:BuildRequires: perl(IO::Socket::SSL)} %{?_with_livetests:BuildRequires: perl(Test::LongString)} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description "WWW::Mechanize", or Mech for short, helps you automate interaction @@ -37,7 +41,14 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor %{!?_with_livetests: --nolive} < /dev/null +%{__perl} Makefile.PL INSTALLDIRS=vendor \ +%if %{livetests} + --live \ +%else + --nolive \ +%endif + --local \ + --mech-dump < /dev/null make %{?_smp_mflags} @@ -50,7 +61,7 @@ %check -#make test +make test %clean @@ -67,6 +78,9 @@ %changelog +* Thu Feb 2 2006 Jose Pedro Oliveira - 1.18-1 +- Update to 1.18. + * Thu Nov 10 2005 Jose Pedro Oliveira - 1.16-1 - Update to 1.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Nov 2005 20:35:18 -0000 1.4 +++ sources 2 Feb 2006 19:44:01 -0000 1.5 @@ -1 +1 @@ -1fda15f7c031105cd0e2b9bbdafb647f WWW-Mechanize-1.16.tar.gz +d537bfefc84806227fd280a792f6527d WWW-Mechanize-1.18.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 20:10:56 2006 From: fedora-extras-commits at redhat.com (Andy Burns (adslpipe)) Date: Thu, 2 Feb 2006 15:10:56 -0500 Subject: kadischi/doc README,1.6,1.7 TODO,1.3,1.4 Message-ID: <200602022011.k12KBQwU008116@cvs-int.fedora.redhat.com> Author: adslpipe Update of /cvs/devel/kadischi/doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8090/doc Modified Files: README TODO Log Message: update docs as cvs test Index: README =================================================================== RCS file: /cvs/devel/kadischi/doc/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README 24 Aug 2005 21:17:25 -0000 1.6 +++ README 2 Feb 2006 20:10:53 -0000 1.7 @@ -1,9 +1,11 @@ +Kadischi : The Fedora Live CD Project + Kadischi is an application for Fedora-based Live CD generation. It takes Fedora repository as an input and outputs a livecd iso image. Kadischi is still in the early stage of development, but has basic functionality and can be run successfully. -Kadischi home page is http://fedoraproject.org/wiki/Kadischi. +Kadischi's home page is http://fedoraproject.org/wiki/Kadischi -Kadischi tutorial can be found here http://fedoraproject.org/wiki/KadischiDoc. \ No newline at end of file +Kadischi tutorial can be found here http://fedoraproject.org/wiki/Kadischi/Documentation Index: TODO =================================================================== RCS file: /cvs/devel/kadischi/doc/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TODO 24 Aug 2005 21:17:25 -0000 1.3 +++ TODO 2 Feb 2006 20:10:53 -0000 1.4 @@ -1 +1 @@ -Fresh TODO list can be found at http://fedoraproject.org/wiki/KadischiTODO \ No newline at end of file +Fresh TODO list can be found at http://fedoraproject.org/wiki/Kadischi/Schedule From fedora-extras-commits at redhat.com Thu Feb 2 20:13:19 2006 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Thu, 2 Feb 2006 15:13:19 -0500 Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.6, 1.7 Message-ID: <200602022013.k12KDpsP008145@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8128 Modified Files: nautilus-open-terminal.spec Log Message: Remove superfluous docs (#179289) Index: nautilus-open-terminal.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nautilus-open-terminal.spec 8 Oct 2005 20:50:08 -0000 1.6 +++ nautilus-open-terminal.spec 2 Feb 2006 20:13:19 -0000 1.7 @@ -1,6 +1,6 @@ Name: nautilus-open-terminal Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Nautilus extension for an open terminal shortcut Group: User Interface/Desktops @@ -45,10 +45,13 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO +%doc AUTHORS COPYING NEWS TODO %{_libdir}/nautilus/extensions-1.0/*.so* %changelog +* Thu Feb 2 2006 Paul W. Frields - 0.6-2 +- Remove superfluous docs (#179289, thanks Brian Pepple) + * Sat Oct 8 2005 Paul W. Frields - 0.6-1 - Update to version 0.6 From fedora-extras-commits at redhat.com Thu Feb 2 20:48:39 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Thu, 2 Feb 2006 15:48:39 -0500 Subject: owners owners.list,1.598,1.599 Message-ID: <200602022049.k12KnBZH008368@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8351 Modified Files: owners.list Log Message: - taking ownership of galculator Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.598 retrieving revision 1.599 diff -u -r1.598 -r1.599 --- owners.list 2 Feb 2006 17:08:06 -0000 1.598 +++ owners.list 2 Feb 2006 20:48:39 -0000 1.599 @@ -256,7 +256,7 @@ Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|galculator|GTK 2 based scientific calculator|extras-orphan at fedoraproject.org|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| Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Feb 2 21:12:14 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 2 Feb 2006 16:12:14 -0500 Subject: fedora-security/audit fc4,1.141,1.142 fc5,1.51,1.52 Message-ID: <200602022112.k12LCEUO010233@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10213 Modified Files: fc4 fc5 Log Message: Add a slew of mozilla CVE ids. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- fc4 2 Feb 2006 12:19:02 -0000 1.141 +++ fc4 2 Feb 2006 21:12:05 -0000 1.142 @@ -13,6 +13,30 @@ CVE-2006-0301 VULNERABLE (xpdf) bz#179047 CVE-2006-0301 VULNERABLE (poppler) bz#179054 CVE-2006-0301 VULNERABLE (kdegraphics) bz#179056 +CVE-2006-0299 version (firefox, 1.5 only) +CVE-2006-0299 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (thunderbird, 1.5 only) +CVE-2006-0298 version (firefox, 1.5 only) +CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (thunderbird, 1.5 only) +CVE-2006-0297 version (firefox, 1.5 only) +CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0297 version (thunderbird, 1.5 only) +CVE-2006-0296 VULNERABLE (firefox) +CVE-2006-0296 VULNERABLE (mozilla) +CVE-2006-0296 VULNERABLE (thunderbird) +CVE-2006-0295 version (firefox, 1.5 only) +CVE-2006-0295 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (thunderbird, 1.5 only) +CVE-2006-0294 version (firefox, 1.5 only) +CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (thunderbird, 1.5 only) +CVE-2006-0293 version (firefox, 1.5 only) +CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0293 version (thunderbird, 1.5 only) +CVE-2006-0292 VULNERABLE (firefox) +CVE-2006-0292 VULNERABLE (mozilla) +CVE-2006-0292 VULNERABLE (thunderbird) CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178 CVE-2006-0236 ignore (thunderbird) windows only flaw CVE-2006-0225 backport (openssh) [since FEDORA-2006-056] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- fc5 2 Feb 2006 12:19:02 -0000 1.51 +++ fc5 2 Feb 2006 21:12:05 -0000 1.52 @@ -25,6 +25,30 @@ CVE-2006-0301 VULNERABLE (xpdf) bz#179423 CVE-2006-0301 VULNERABLE (poppler) bz#179424 CVE-2006-0301 VULNERABLE (kdegraphics) bz#179425 +CVE-2006-0299 VULNERABLE (firefox) +CVE-2006-0299 version (mozilla, 1.8 branch only) +CVE-2006-0299 VULNERABLE (thunderbird) +CVE-2006-0298 VULNERABLE (firefox) +CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0298 VULNERABLE (thunderbird) +CVE-2006-0297 VULNERABLE (firefox) +CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0297 VULNERABLE (thunderbird) +CVE-2006-0296 VULNERABLE (firefox) +CVE-2006-0296 VULNERABLE (mozilla) +CVE-2006-0296 VULNERABLE (thunderbird) +CVE-2006-0295 VULNERABLE (firefox) +CVE-2006-0295 version (mozilla, 1.8 branch only) +CVE-2006-0295 VULNERABLE (thunderbird) +CVE-2006-0294 VULNERABLE (firefox) +CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0294 VULNERABLE (thunderbird) +CVE-2006-0293 VULNERABLE (firefox) +CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0293 VULNERABLE (thunderbird) +CVE-2006-0292 VULNERABLE (firefox) +CVE-2006-0292 VULNERABLE (mozilla) +CVE-2006-0292 VULNERABLE (thunderbird) CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179 CVE-2006-0236 ignore (thunderbird) windows only flaw CVE-2006-0225 VULNERABLE (openssh) From fedora-extras-commits at redhat.com Thu Feb 2 21:16:11 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 2 Feb 2006 16:16:11 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet-2.13.90-fedorabz.patch, NONE, 1.1 deskbar-applet-2.13.90-gnomeapplet.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 deskbar-applet.spec, 1.12, 1.13 sources, 1.7, 1.8 deskbar-applet-0.8.6-fedorabz.patch, 1.1, NONE Message-ID: <200602022116.k12LGiJw010281@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254 Modified Files: .cvsignore deskbar-applet.spec sources Added Files: deskbar-applet-2.13.90-fedorabz.patch deskbar-applet-2.13.90-gnomeapplet.patch Removed Files: deskbar-applet-0.8.6-fedorabz.patch Log Message: Upstream update deskbar-applet-2.13.90-fedorabz.patch: --- NEW FILE deskbar-applet-2.13.90-fedorabz.patch --- --- deskbar-applet-2.13.90/deskbar/handlers/Makefile.in.fedorabz 2006-01-30 17:43:23.000000000 -0500 +++ deskbar-applet-2.13.90/deskbar/handlers/Makefile.in 2006-02-02 02:12:28.000000000 -0500 @@ -238,7 +238,7 @@ deskbar_handlersdir = $(libdir)/deskbar-applet/handlers deskbar_handlers_PYTHON = beagle.py beagle-live.py email_address.py \ epiphany.py files.py galago.py galeon.py gtkbookmarks.py \ - google-live.py history.py mozilla.py programs.py \ + google-live.py history.py mozilla.py programs.py fedorabz.py \ pathprograms.py volumes.py web_address.py $(am__append_1) EXTRA_DIST = \ debug-async_handler.py \ --- deskbar-applet-2.13.90/data/art/Makefile.in.fedorabz 2006-01-30 20:28:58.000000000 -0500 +++ deskbar-applet-2.13.90/data/art/Makefile.in 2006-02-02 02:09:44.000000000 -0500 @@ -244,6 +244,7 @@ deskbar-applet-panel-v.png \ deskbar-applet-panel-h.png \ deskbar-applet-small.png \ + fedorabz.png \ folder-bookmark.png \ generic.png \ google.png deskbar-applet-2.13.90-gnomeapplet.patch: --- NEW FILE deskbar-applet-2.13.90-gnomeapplet.patch --- --- deskbar-applet-2.13.90/configure.gnomeapplet 2006-02-02 10:31:07.000000000 -0500 +++ deskbar-applet-2.13.90/configure 2006-02-02 10:32:17.000000000 -0500 @@ -22089,30 +22089,7 @@ -py_mod_var=`echo gnomeapplet'_' | sed 'y%./+-%__p_%'` -echo "$as_me:$LINENO: checking for python module gnomeapplet" >&5 -echo $ECHO_N "checking for python module gnomeapplet... $ECHO_C" >&6 -if eval "test \"\${py_cv_mod_$py_mod_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -prog=" -import sys -try: - import gnomeapplet -except ImportError: - sys.exit(1) -except: - sys.exit(0) -sys.exit(0)" -if $PYTHON -c "$prog" 1>&5 2>&5 - then - eval "py_cv_mod_$py_mod_var=yes" - else - eval "py_cv_mod_$py_mod_var=no" - fi - -fi +eval "py_cv_mod_gnomeapplet=yes" py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` if test "x$py_val" != xno; then Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Jan 2006 04:57:26 -0000 1.7 +++ .cvsignore 2 Feb 2006 21:16:11 -0000 1.8 @@ -1 +1 @@ -deskbar-applet-0.8.7.tar.bz2 +deskbar-applet-2.13.90.tar.bz2 Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- deskbar-applet.spec 3 Jan 2006 04:57:26 -0000 1.12 +++ deskbar-applet.spec 2 Feb 2006 21:16:11 -0000 1.13 @@ -2,20 +2,21 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 0.8.7 +Version: 2.13.90 Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet License: GPL URL: http://browserbookapp.sourceforge.net/deskbar.html -Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/0.8/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.13/%{name}-%{version}.tar.bz2 Source1: fedorabz.py Source2: fedorabz.png -Patch0: deskbar-applet-0.8.6-fedorabz.patch +Patch0: deskbar-applet-2.13.90-fedorabz.patch +Patch1: deskbar-applet-2.13.90-gnomeapplet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel -Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf +BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet +Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2 %description This applet looks like the current Gnome Mini-Commander, but it launches search @@ -35,6 +36,7 @@ cp %{SOURCE1} deskbar/handlers cp %{SOURCE2} data/art %patch -p1 -b .fedorabz +%patch1 -p1 -b .gnomeapplet %build %configure @@ -55,10 +57,15 @@ %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_libdir}/%{name} %{_libdir}/bonobo/servers/Deskbar_Applet.server +%{_libdir}/pkgconfig/%{name}.pc %{python_sitelib}/deskbar %{_datadir}/%{name} +%{_datadir}/pixmaps/%{name}.svg %changelog +* Thu Feb 2 2006 Ignacio Vazquez-Abrams 2.13.90-1 +- Upstream update + * Tue Jan 3 2006 Ignacio Vazquez-Abrams 0.8.7-1 - Upstream update Index: sources =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Jan 2006 04:57:26 -0000 1.7 +++ sources 2 Feb 2006 21:16:11 -0000 1.8 @@ -1 +1 @@ -6ecb74c123b66aa2874d88b5b7cfbaf6 deskbar-applet-0.8.7.tar.bz2 +fe8c47c622589a8b1e857ab6a2b0cd1b deskbar-applet-2.13.90.tar.bz2 --- deskbar-applet-0.8.6-fedorabz.patch DELETED --- From fedora-extras-commits at redhat.com Thu Feb 2 21:37:26 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 2 Feb 2006 16:37:26 -0500 Subject: rpms/ginac/devel ginac-1.3.3-gcc41.patch, NONE, 1.1 ginac.spec, 1.5, 1.6 Message-ID: <200602022137.k12LbxPT010424@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10404 Modified Files: ginac.spec Added Files: ginac-1.3.3-gcc41.patch Log Message: Patch so it builds on gcc4. Other misc spec changes. ginac-1.3.3-gcc41.patch: --- NEW FILE ginac-1.3.3-gcc41.patch --- --- ginac/indexed.cpp.~1~ 2005-05-19 09:24:35.000000000 -0500 +++ ginac/indexed.cpp 2006-02-02 15:20:25.000000000 -0600 @@ -704,6 +704,9 @@ } } +// Forward declaration needed in absence of friend injection, C.f. [namespace.memdef]: +ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indices, const scalar_products & sp); + /** Simplify product of indexed expressions (commutative, noncommutative and * simple squares), return list of free indices. */ ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & dummy_indices, const scalar_products & sp) Index: ginac.spec =================================================================== RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ginac.spec 2 Feb 2006 16:58:09 -0000 1.5 +++ ginac.spec 2 Feb 2006 21:37:26 -0000 1.6 @@ -1,12 +1,13 @@ Name: ginac Version: 1.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for symbolic calculations Group: System Environment/Libraries License: GPL URL: http://www.ginac.de/ Source0: http://www.ginac.de/%{name}-%{version}.tar.bz2 +Patch0: ginac-1.3.3-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -54,14 +55,16 @@ %prep %setup -q +%patch0 -p0 %build -%configure -make +%configure --disable-dependency-tracking --disable-static +make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} %makeinstall +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf ${RPM_BUILD_ROOT} @@ -93,9 +96,7 @@ %{_includedir}/ginac %{_bindir}/ginac-config %{_datadir}/aclocal/ginac.m4 -%exclude %{_libdir}/*.a %exclude %{_libdir}/*.la -%exclude %{_infodir}/dir %files utils %defattr(-,root,root) @@ -105,6 +106,10 @@ %{_mandir}/man?/viewgar.1* %changelog +* Thu Feb 2 2006 Quentin Spencer 1.3.3-3 +- Patch so it builds on gcc 4.1. +- Disable static libs from build and enable parallel build. + * Wed Feb 1 2006 Quentin Spencer 1.3.3-2 - Exclude /usr/share/info/dir from package. - New URL. From fedora-extras-commits at redhat.com Thu Feb 2 21:50:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 16:50:09 -0500 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wine-docs.spec, 1.3, 1.4 Message-ID: <200602022150.k12LogCk010592@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-serv10531/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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jan 2006 22:37:34 -0000 1.3 +++ .cvsignore 2 Feb 2006 21:50:09 -0000 1.4 @@ -1 +1 @@ -wine-docs-0.9.6.tar.bz2 +wine-docs-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jan 2006 22:37:34 -0000 1.3 +++ sources 2 Feb 2006 21:50:09 -0000 1.4 @@ -1 +1 @@ -23c9067d57639c637eaf065feb6c9917 wine-docs-0.9.6.tar.bz2 +bd6e228143b0aba5940c94dfcde610e0 wine-docs-0.9.7.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wine-docs.spec 19 Jan 2006 22:37:34 -0000 1.3 +++ wine-docs.spec 2 Feb 2006 21:50:09 -0000 1.4 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.6 +Version: 0.9.7 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.6.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,14 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Thu Feb 02 2006 Andreas Bierfert +0.9.7-1 +- version upgrade + +* Fri Jan 20 2006 Andreas Bierfert +0.9.6-2 +- try to fix fc4 build + * Thu Jan 19 2006 Andreas Bierfert 0.9.6-1 - version upgrade From fedora-extras-commits at redhat.com Thu Feb 2 21:50:15 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 16:50:15 -0500 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wine-docs.spec, 1.4, 1.5 Message-ID: <200602022150.k12Lolk0010597@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-serv10531/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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jan 2006 22:37:40 -0000 1.3 +++ .cvsignore 2 Feb 2006 21:50:15 -0000 1.4 @@ -1 +1 @@ -wine-docs-0.9.6.tar.bz2 +wine-docs-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jan 2006 22:37:40 -0000 1.3 +++ sources 2 Feb 2006 21:50:15 -0000 1.4 @@ -1 +1 @@ -23c9067d57639c637eaf065feb6c9917 wine-docs-0.9.6.tar.bz2 +bd6e228143b0aba5940c94dfcde610e0 wine-docs-0.9.7.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wine-docs.spec 20 Jan 2006 09:10:46 -0000 1.4 +++ wine-docs.spec 2 Feb 2006 21:50:15 -0000 1.5 @@ -1,17 +1,16 @@ Name: wine-docs -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +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.6.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf BuildRequires: openjade -BuildRequires: elinks %description This package is Wine's documentation repository. It consists of @@ -38,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Thu Feb 02 2006 Andreas Bierfert +0.9.7-1 +- version upgrade + * Fri Jan 20 2006 Andreas Bierfert 0.9.6-2 - try to fix fc4 build From fedora-extras-commits at redhat.com Thu Feb 2 21:50:21 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 16:50:21 -0500 Subject: rpms/wine-docs/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wine-docs.spec, 1.3, 1.4 Message-ID: <200602022150.k12LorhZ010606@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10531/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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jan 2006 22:37:46 -0000 1.3 +++ .cvsignore 2 Feb 2006 21:50:21 -0000 1.4 @@ -1 +1 @@ -wine-docs-0.9.6.tar.bz2 +wine-docs-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jan 2006 22:37:46 -0000 1.3 +++ sources 2 Feb 2006 21:50:21 -0000 1.4 @@ -1 +1 @@ -23c9067d57639c637eaf065feb6c9917 wine-docs-0.9.6.tar.bz2 +bd6e228143b0aba5940c94dfcde610e0 wine-docs-0.9.7.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wine-docs.spec 19 Jan 2006 22:37:46 -0000 1.3 +++ wine-docs.spec 2 Feb 2006 21:50:21 -0000 1.4 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.6 +Version: 0.9.7 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.6.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,14 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Thu Feb 02 2006 Andreas Bierfert +0.9.7-1 +- version upgrade + +* Fri Jan 20 2006 Andreas Bierfert +0.9.6-2 +- try to fix fc4 build + * Thu Jan 19 2006 Andreas Bierfert 0.9.6-1 - version upgrade From fedora-extras-commits at redhat.com Thu Feb 2 22:10:26 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Feb 2006 17:10:26 -0500 Subject: rpms/hdf/devel hdf-4.2r1-ppc.patch,NONE,1.1 hdf.spec,1.5,1.6 Message-ID: <200602022210.k12MAwTt012561@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12531 Modified Files: hdf.spec Added Files: hdf-4.2r1-ppc.patch Log Message: Add patch to build on ppc hdf-4.2r1-ppc.patch: --- NEW FILE hdf-4.2r1-ppc.patch --- --- HDF4.2r1/hdf/src/hdfi.h.orig 2005-01-24 20:36:44.000000000 -0700 +++ HDF4.2r1/hdf/src/hdfi.h 2006-02-02 21:54:59.347516688 -0700 @@ -72,6 +72,7 @@ #define DFMT_CRAYMPP 0x1171 #define DFMT_IA64 0x4441 #define DFMT_LINUX64 0x4441 +#define DFMT_LINUXPPC 0x1111 /* I/O library constants */ #define UNIXUNBUFIO 1 @@ -1326,6 +1327,57 @@ #endif /*Linux 64 */ +/* Linux PPC */ +#if defined __PPC__ + +#ifdef GOT_MACHINE +If you get an error on this line more than one machine type has been defined. +Please check your Makefile. +#endif +#define GOT_MACHINE + +#include /* for unbuffered i/o stuff */ +#include +#define DF_MT DFMT_LINUXPPC +typedef void VOID; +typedef void *VOIDP; +typedef char *_fcd; +typedef char char8; +typedef unsigned char uchar8; +typedef char int8; +typedef unsigned char uint8; +typedef short int int16; +typedef unsigned short int uint16; +typedef int int32; +typedef unsigned int uint32; +typedef int intn; +typedef unsigned int uintn; +typedef int intf; /* size of INTEGERs in Fortran compiler */ +typedef float float32; +typedef double float64; +typedef long hdf_pint_t; /* an integer the same size as a pointer */ +#define FNAME_POST_UNDERSCORE +#define _fcdtocp(desc) (desc) +#ifdef HAVE_FMPOOL +#define FILELIB PAGEBUFIO /* enable page buffering */ +#else +#define FILELIB UNIXBUFIO +#endif + +/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ + +/* Determine the memory manager we are going to use. Valid values are: */ +/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ +/* what each does */ +#define JMEMSYS MEM_ANSI + +#ifdef __GNUC__ +#define HAVE_STDC +#define INCLUDES_ARE_ANSI +#endif + +#endif /*Linux PPC */ + /*#ifndef GOT_MACHINE No machine type has been defined. Your Makefile needs to have someing like -DSUN or -DUNICOS in order for the HDF internal structures to be defined Index: hdf.spec =================================================================== RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hdf.spec 21 Dec 2005 17:22:42 -0000 1.5 +++ hdf.spec 2 Feb 2006 22:10:26 -0000 1.6 @@ -1,6 +1,6 @@ Name: hdf Version: 4.2r1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -8,10 +8,10 @@ Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz Source1: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/patches/4.2r1-hrepack-patch.tar Patch0: hdf-4.2r1-configure.patch +Patch1: hdf-4.2r1-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel BuildRequires: gcc-gfortran -ExcludeArch: ppc ppc64 %description HDF is a general purpose library and file format for storing scientific data. @@ -37,6 +37,7 @@ mv mfhdf/hrepack/4.2r1-hrepack-patch/*.[ch] mfhdf/hrepack rm -r mfhdf/hrepack/4.2r1-hrepack-patch %patch0 -p1 -b .orig +%patch1 -p1 -b .orig %build autoconf @@ -73,6 +74,9 @@ %{_libdir}/%{name}/ %changelog +* Thu Feb 2 2006 Orion Poplawski 4.2r1-7 +- Add patch to build on ppc + * Wed Dec 21 2005 Orion Poplawski 4.2r1-6 - Rebuild From fedora-extras-commits at redhat.com Thu Feb 2 22:14:04 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 2 Feb 2006 17:14:04 -0500 Subject: rpms/ginac/FC-4 ginac.spec,1.3,1.4 Message-ID: <200602022214.k12MEaaF012663@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12646 Modified Files: ginac.spec Log Message: Disable static libs, enable parallel build. Index: ginac.spec =================================================================== RCS file: /cvs/extras/rpms/ginac/FC-4/ginac.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ginac.spec 2 Feb 2006 17:07:25 -0000 1.3 +++ ginac.spec 2 Feb 2006 22:14:04 -0000 1.4 @@ -56,12 +56,13 @@ %setup -q %build -%configure -make +%configure --disable-dependency-tracking --disable-static +make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} %makeinstall +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf ${RPM_BUILD_ROOT} @@ -93,9 +94,7 @@ %{_mandir}/man1/ginac-config.1* %{_bindir}/ginac-config %{_datadir}/aclocal/ginac.m4 -%exclude %{_libdir}/*.a %exclude %{_libdir}/*.la -%exclude %{_infodir}/dir %files utils %defattr(-,root,root) @@ -105,8 +104,8 @@ %{_mandir}/man1/viewgar.1* %changelog -* Thu Feb 2 2006 Quentin Spencer 1.3.3-2 -- Exclude static libs and /usr/share/info/dir from package. +* Thu Feb 2 2006 Quentin Spencer 1.3.3-3 +- Disable static libs, remove /usr/share/info/dir, and enable parallel build. * Mon Oct 31 2005 Quentin Spencer 1.3.3-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Feb 2 22:42:40 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Feb 2006 17:42:40 -0500 Subject: rpms/gdl/devel gdl.spec,1.7,1.8 Message-ID: <200602022243.k12MhCAE012802@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12785 Modified Files: gdl.spec Log Message: Enable hdf for ppc Index: gdl.spec =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gdl.spec 3 Jan 2006 21:32:20 -0000 1.7 +++ gdl.spec 2 Feb 2006 22:42:40 -0000 1.8 @@ -1,6 +1,6 @@ Name: gdl Version: 0.8.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU Data Language Group: Applications/Engineering @@ -13,17 +13,7 @@ BuildRequires: gsl-devel, plplot-devel, ImageMagick-c++-devel BuildRequires: netcdf-devel, hdf5-devel, libjpeg-devel BuildRequires: python-devel, python-numarray, python-matplotlib -BuildRequires: fftw3-devel -%ifnarch ppc ppc64 -BuildRequires: hdf-devel -%define hdfconfig %{nil} -%define hdfinclude "-I/usr/include/hdf" -%define hdflib "-L%{_libdir}/hdf" -%else -%define hdfconfig "--with-hdf=no" -%define hdfinclude %{nil} -%define hdflib %{nil} -%endif +BuildRequires: fftw3-devel, hdf-devel %description @@ -37,9 +27,9 @@ %build -%configure --disable-static %{hdfconfig} \ - INCLUDES="-I/usr/include/netcdf-3 %{hdfinclude}" \ - LIBS="-L%{_libdir}/netcdf-3 %{hdflib}" +%configure --disable-static \ + INCLUDES="-I/usr/include/netcdf-3 -I/usr/include/hdf" \ + LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf" make %{?_smp_mflags} @@ -59,6 +49,9 @@ %changelog +* Thu Feb 2 2006 - Orion Poplawski - 0.8.11-3 +- Enable hdf for ppc + * Tue Jan 3 2006 - Orion Poplawski - 0.8.11-2 - Rebuild From fedora-extras-commits at redhat.com Thu Feb 2 22:51:41 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Thu, 2 Feb 2006 17:51:41 -0500 Subject: rpms/new import.log,1.4,1.5 Message-ID: <200602022252.k12MqD0u012922@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/new In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12888 Modified Files: import.log Log Message: auto-import new-1.3.7-1 on branch devel from new-1.3.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/new/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 2 Feb 2006 04:45:58 -0000 1.4 +++ import.log 2 Feb 2006 22:51:41 -0000 1.5 @@ -1,3 +1,4 @@ new-1_3_5-2:HEAD:new-1.3.5-2.src.rpm:1135031407 new-1_3_5-3:HEAD:new-1.3.5-3.src.rpm:1135455132 new-1_3_6-1:HEAD:new-1.3.6-1.src.rpm:1138855552 +new-1_3_7-1:HEAD:new-1.3.7-1.src.rpm:1138920696 From fedora-extras-commits at redhat.com Thu Feb 2 22:51:47 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Thu, 2 Feb 2006 17:51:47 -0500 Subject: rpms/new/devel .cvsignore,1.3,1.4 new.spec,1.3,1.4 sources,1.3,1.4 Message-ID: <200602022252.k12MqJuO012927@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/new/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12888/devel Modified Files: .cvsignore new.spec sources Log Message: auto-import new-1.3.7-1 on branch devel from new-1.3.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/new/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 04:46:05 -0000 1.3 +++ .cvsignore 2 Feb 2006 22:51:46 -0000 1.4 @@ -1 +1 @@ -new-1.3.6.tar.gz +new-1.3.7.tar.gz Index: new.spec =================================================================== RCS file: /cvs/extras/rpms/new/devel/new.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- new.spec 2 Feb 2006 04:46:05 -0000 1.3 +++ new.spec 2 Feb 2006 22:51:46 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A simple template system Name: new -Version: 1.3.6 +Version: 1.3.7 Release: 1 License: GPL Group: Development/Tools @@ -98,7 +98,10 @@ %changelog -* Wed Feb 02 2006 W. Michael Petullo - 1.3.6-1 +* Thu Feb 02 2006 W. Michael Petullo - 1.3.7-1 + - Updated to new 1.3.7. + +* Wed Feb 01 2006 W. Michael Petullo - 1.3.6-1 - Updated to new 1.3.6. * Sat Dec 24 2005 W. Michael Petullo - 1.3.5-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/new/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 04:46:05 -0000 1.3 +++ sources 2 Feb 2006 22:51:46 -0000 1.4 @@ -1 +1 @@ -61045de4410d1937f59224d3417691b2 new-1.3.6.tar.gz +46337e1b20f4104da408bac2d38a744c new-1.3.7.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 23:11:55 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 2 Feb 2006 18:11:55 -0500 Subject: rpms/deskbar-applet/devel fedorabz.py,1.3,1.4 Message-ID: <200602022312.k12NCRam014855@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14836 Modified Files: fedorabz.py Log Message: Quick fix Index: fedorabz.py =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/fedorabz.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedorabz.py 1 Dec 2005 13:17:21 -0000 1.3 +++ fedorabz.py 2 Feb 2006 23:11:54 -0000 1.4 @@ -1,7 +1,6 @@ from gettext import gettext as _ -import deskbar, deskbar.indexer -import deskbar.handler +import deskbar import gnomevfs HANDLERS = { @@ -13,9 +12,9 @@ bzurl="https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=%s" -class FedoraBZMatch(deskbar.handler.Match): +class FedoraBZMatch(deskbar.Match.Match): def __init__(self, backend, url): - deskbar.handler.Match.__init__(self, backend, url) + deskbar.Match.Match.__init__(self, backend, name=url) if url.isdigit(): self._num=url @@ -25,10 +24,9 @@ def get_verb(self): return _("Open Fedora Bugzilla report #%(name)s") -class FedoraBZHandler(deskbar.handler.Handler): +class FedoraBZHandler(deskbar.Handler.Handler): def __init__(self): - deskbar.handler.Handler.__init__(self, "fedorabz.png") - self._relative = True + deskbar.Handler.Handler.__init__(self, "fedorabz.png") def query(self, query, max=5): if query.isdigit(): From fedora-extras-commits at redhat.com Thu Feb 2 23:19:13 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 18:19:13 -0500 Subject: rpms/wine/FC-3 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 wine.spec, 1.7, 1.8 Message-ID: <200602022319.k12NJjD1014954@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14899/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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Jan 2006 23:37:48 -0000 1.5 +++ .cvsignore 2 Feb 2006 23:19:13 -0000 1.6 @@ -1,2 +1,2 @@ -wine-0.9.6.tar.bz2 wine-fonts-20050524.tar.gz +wine-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Jan 2006 23:37:48 -0000 1.6 +++ sources 2 Feb 2006 23:19:13 -0000 1.7 @@ -1,2 +1,2 @@ -1e3bfac123009300646a0b8a7fcfd81d wine-0.9.6.tar.bz2 fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz +92b9af6e2c108bda8d23497abd9d0356 wine-0.9.7.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wine.spec 19 Jan 2006 23:33:21 -0000 1.7 +++ wine.spec 2 Feb 2006 23:19:13 -0000 1.8 @@ -1,12 +1,12 @@ Name: wine -Version: 0.9.6 +Version: 0.9.7 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators License: LGPL URL: http://www.winehq.org/ -Source0: http://dl.sf.net/wine/wine-0.9.6.tar.bz2 +Source0: http://dl.sf.net/wine/wine-0.9.7.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -280,7 +280,7 @@ %files %defattr(-,root,root,-) -%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD +%doc ANNOUNCE COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD %doc AUTHORS README-Fedora README VERSION %doc documentation/* %{_bindir}/msiexec @@ -676,6 +676,10 @@ %{_libdir}/wine/*.def %changelog +* Thu Feb 02 2006 Andreas Bierfert +0.9.7-1 +- version upgrade + * Thu Jan 19 2006 Andreas Bierfert 0.9.6-1 - version upgrade From fedora-extras-commits at redhat.com Thu Feb 2 23:19:19 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 18:19:19 -0500 Subject: rpms/wine/FC-4 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 wine.spec, 1.9, 1.10 Message-ID: <200602022319.k12NJpKF014959@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14899/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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jan 2006 23:37:54 -0000 1.6 +++ .cvsignore 2 Feb 2006 23:19:19 -0000 1.7 @@ -1,2 +1,2 @@ -wine-0.9.6.tar.bz2 wine-fonts-20050524.tar.gz +wine-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Jan 2006 23:37:54 -0000 1.7 +++ sources 2 Feb 2006 23:19:19 -0000 1.8 @@ -1,2 +1,2 @@ -1e3bfac123009300646a0b8a7fcfd81d wine-0.9.6.tar.bz2 fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz +92b9af6e2c108bda8d23497abd9d0356 wine-0.9.7.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine.spec 19 Jan 2006 23:33:27 -0000 1.9 +++ wine.spec 2 Feb 2006 23:19:19 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine -Version: 0.9.6 +Version: 0.9.7 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators License: LGPL URL: http://www.winehq.org/ -Source0: http://dl.sf.net/wine/wine-0.9.6.tar.bz2 +Source0: http://dl.sf.net/wine/wine-0.9.7.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -280,7 +280,7 @@ %files %defattr(-,root,root,-) -%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD +%doc ANNOUNCE COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD %doc AUTHORS README-Fedora README VERSION %doc documentation/* %{_bindir}/msiexec @@ -676,6 +676,10 @@ %{_libdir}/wine/*.def %changelog +* Thu Feb 02 2006 Andreas Bierfert +0.9.7-1 +- version upgrade + * Thu Jan 19 2006 Andreas Bierfert 0.9.6-1 - version upgrade From fedora-extras-commits at redhat.com Thu Feb 2 23:19:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Feb 2006 18:19:25 -0500 Subject: rpms/wine/devel .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 wine.spec, 1.11, 1.12 Message-ID: <200602022319.k12NJvnq014964@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14899/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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jan 2006 23:38:00 -0000 1.6 +++ .cvsignore 2 Feb 2006 23:19:25 -0000 1.7 @@ -1,2 +1,2 @@ -wine-0.9.6.tar.bz2 wine-fonts-20050524.tar.gz +wine-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Jan 2006 23:38:00 -0000 1.7 +++ sources 2 Feb 2006 23:19:25 -0000 1.8 @@ -1,2 +1,2 @@ -1e3bfac123009300646a0b8a7fcfd81d wine-0.9.6.tar.bz2 fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz +92b9af6e2c108bda8d23497abd9d0356 wine-0.9.7.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- wine.spec 19 Jan 2006 23:33:33 -0000 1.11 +++ wine.spec 2 Feb 2006 23:19:25 -0000 1.12 @@ -1,14 +1,14 @@ %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.6 +Version: 0.9.7 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators License: LGPL URL: http://www.winehq.org/ -Source0: http://dl.sf.net/wine/wine-0.9.6.tar.bz2 +Source0: http://dl.sf.net/wine/wine-0.9.7.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -293,7 +293,7 @@ %files %defattr(-,root,root,-) -%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD +%doc ANNOUNCE COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD %doc AUTHORS README-Fedora README VERSION %doc documentation/* %{_bindir}/msiexec @@ -689,6 +689,10 @@ %{_libdir}/wine/*.def %changelog +* Thu Feb 02 2006 Andreas Bierfert +0.9.7-1 +- version upgrade + * Thu Jan 19 2006 Andreas Bierfert 0.9.6-1 - version upgrade From fedora-extras-commits at redhat.com Thu Feb 2 23:25:08 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Feb 2006 18:25:08 -0500 Subject: rpms/gdl/devel gdl.spec,1.8,1.9 Message-ID: <200602022325.k12NPeLi015004@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14985 Modified Files: gdl.spec Log Message: Change fftw3 to fftw Index: gdl.spec =================================================================== RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gdl.spec 2 Feb 2006 22:42:40 -0000 1.8 +++ gdl.spec 2 Feb 2006 23:25:07 -0000 1.9 @@ -13,7 +13,7 @@ BuildRequires: gsl-devel, plplot-devel, ImageMagick-c++-devel BuildRequires: netcdf-devel, hdf5-devel, libjpeg-devel BuildRequires: python-devel, python-numarray, python-matplotlib -BuildRequires: fftw3-devel, hdf-devel +BuildRequires: fftw-devel, hdf-devel %description @@ -51,6 +51,7 @@ %changelog * Thu Feb 2 2006 - Orion Poplawski - 0.8.11-3 - Enable hdf for ppc +- Change fftw3 to fftw * Tue Jan 3 2006 - Orion Poplawski - 0.8.11-2 - Rebuild From fedora-extras-commits at redhat.com Thu Feb 2 23:34:46 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 2 Feb 2006 18:34:46 -0500 Subject: rpms/python-sqlite2/FC-4 .cvsignore, 1.3, 1.4 python-sqlite2.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200602022335.k12NZIuu015185@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/python-sqlite2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15151 Modified Files: .cvsignore python-sqlite2.spec sources Log Message: Downgrade to 2.0.7 (sqlite in FC-4 is too old) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jan 2006 13:15:59 -0000 1.3 +++ .cvsignore 2 Feb 2006 23:34:45 -0000 1.4 @@ -1 +1 @@ -pysqlite-2.1.0.tar.gz +pysqlite-2.0.7.tar.gz Index: python-sqlite2.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/FC-4/python-sqlite2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-sqlite2.spec 17 Jan 2006 13:15:59 -0000 1.2 +++ python-sqlite2.spec 2 Feb 2006 23:34:45 -0000 1.3 @@ -1,21 +1,22 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-sqlite2 -Version: 2.1.0 +Version: 2.0.7 Release: 1%{?dist} +Epoch: 1 Summary: DB-API 2.0 interface for SQLite 3.x Group: Development/Languages License: zlib/libpng URL: http://pysqlite.org/ -Source0: http://initd.org/pub/software/pysqlite/releases/2.1/%{version}/pysqlite-%{version}.tar.gz +Source0: http://initd.org/pub/software/pysqlite/releases/2.0/%{version}/pysqlite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dos2unix BuildRequires: python-devel BuildRequires: python-setuptools BuildRequires: sqlite-devel -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description pysqlite is an interface to the SQLite 3.x embedded relational database @@ -40,8 +41,8 @@ %{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation %{__rm} documentation/install-source* -%{__rm} documentation/usage-guide.txt -dos2unix documentation/{silvercity.css,code/*} +%{__rm} documentation/*.css +dos2unix documentation/code/* %clean @@ -50,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE documentation/* +%doc LICENSE TODO documentation/* %doc doc/pysqlite-introduction-slides/pysqlite-introduction.pdf %dir %{python_sitearch}/pysqlite2 %{python_sitearch}/pysqlite2/__init__.py @@ -71,6 +72,7 @@ %{python_sitearch}/pysqlite2/test/types.pyc %{python_sitearch}/pysqlite2/test/userfunctions.py %{python_sitearch}/pysqlite2/test/userfunctions.pyc +%{python_sitearch}/pysqlite-%{version}-py%{pyver}.egg-info/ %ghost %{python_sitearch}/pysqlite2/__init__.pyo %ghost %{python_sitearch}/pysqlite2/dbapi2.pyo %ghost %{python_sitearch}/pysqlite2/test/dbapi.pyo @@ -82,6 +84,9 @@ %changelog +* Fri Feb 3 2006 Dawid Gajownik - 1:2.0.7-1 +- Downgrade to 2.0.7 (sqlite in FC-4 is too old) + * Tue Jan 17 2006 Dawid Gajownik - 2.1.0-1 - Update to 2.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jan 2006 13:15:59 -0000 1.3 +++ sources 2 Feb 2006 23:34:45 -0000 1.4 @@ -1 +1 @@ -67530a31508f33d64e86b3e5071822d9 pysqlite-2.1.0.tar.gz +15ab26f859f8a0fd21659d4d105056a5 pysqlite-2.0.7.tar.gz From fedora-extras-commits at redhat.com Thu Feb 2 23:36:43 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Thu, 2 Feb 2006 18:36:43 -0500 Subject: rpms/gnotime/devel gnotime.spec,1.14,1.15 Message-ID: <200602022337.k12NbFqI015217@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/gnotime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15200 Modified Files: gnotime.spec Log Message: * Sun Jan 29 2006 Toshio Kuratomi - 2.2.2-3 - Work around autoconf macro brokenness with an extra BuildRequires. - No longer send HUP to gconfd. This is no longer necessary in FC5+. Index: gnotime.spec =================================================================== RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnotime.spec 29 Jan 2006 20:14:39 -0000 1.14 +++ gnotime.spec 2 Feb 2006 23:36:42 -0000 1.15 @@ -1,6 +1,6 @@ Name: gnotime Version: 2.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tracks and reports time spent Group: Applications/Productivity @@ -16,8 +16,9 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: qof-devel >= 0.6.0 -BuildRequires: libSM-devel -BuildRequires: libX11-devel +# 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 @@ -78,7 +79,6 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || : - killall -HUP gconfd-2 || : unset GCONF_CONFIG_SOURCE fi @@ -87,7 +87,6 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/gnotime.schemas &>/dev/null || : unset GCONF_CONFIG_SOURCE -killall -HUP gconfd-2 || : scrollkeeper-update -q -o %{_datadir}/omf/gnotime || : %preun @@ -96,7 +95,6 @@ gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || : unset GCONF_CONFIG_SOURCE - killall -HUP gconfd-2 || : fi %postun @@ -113,6 +111,10 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Sun Jan 29 2006 Toshio Kuratomi - 2.2.2-3 +- Work around autoconf macro brokenness with an extra BuildRequires. +- No longer send HUP to gconfd. This is no longer necessary in FC5+. + * Sun Jan 29 2006 Toshio Kuratomi - 2.2.2-2 - Modular xorg BuildRequires. From fedora-extras-commits at redhat.com Thu Feb 2 23:58:55 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 2 Feb 2006 18:58:55 -0500 Subject: rpms/deskbar-applet/devel fedorabz.py,1.4,1.5 Message-ID: <200602022359.k12NxSat015421@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15399 Modified Files: fedorabz.py Log Message: When in doubt, seek professional help Index: fedorabz.py =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/fedorabz.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedorabz.py 2 Feb 2006 23:11:54 -0000 1.4 +++ fedorabz.py 2 Feb 2006 23:58:55 -0000 1.5 @@ -13,13 +13,15 @@ bzurl="https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=%s" class FedoraBZMatch(deskbar.Match.Match): - def __init__(self, backend, url): - deskbar.Match.Match.__init__(self, backend, name=url) - if url.isdigit(): - self._num=url + def __init__(self, backend, **args): + deskbar.Match.Match.__init__(self, backend, **args) + self.name=args['name'] def action(self, text=None): - gnomevfs.url_show(bzurl % self._num) + gnomevfs.url_show(bzurl % self.name) + + def get_category(self): + return 'websearch' def get_verb(self): return _("Open Fedora Bugzilla report #%(name)s") @@ -30,4 +32,4 @@ def query(self, query, max=5): if query.isdigit(): - return [FedoraBZMatch(self, query)] + return [FedoraBZMatch(self, name=query)] From fedora-extras-commits at redhat.com Fri Feb 3 00:13:26 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 2 Feb 2006 19:13:26 -0500 Subject: rpms/deskbar-applet/devel fedorabz.py,1.5,1.6 Message-ID: <200602030013.k130DwGO017251@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17228 Modified Files: fedorabz.py Log Message: I *think* it's ready now... Index: fedorabz.py =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/fedorabz.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedorabz.py 2 Feb 2006 23:58:55 -0000 1.5 +++ fedorabz.py 3 Feb 2006 00:13:25 -0000 1.6 @@ -15,7 +15,6 @@ class FedoraBZMatch(deskbar.Match.Match): def __init__(self, backend, **args): deskbar.Match.Match.__init__(self, backend, **args) - self.name=args['name'] def action(self, text=None): gnomevfs.url_show(bzurl % self.name) @@ -24,7 +23,7 @@ return 'websearch' def get_verb(self): - return _("Open Fedora Bugzilla report #%(name)s") + return _("Open Fedora Bugzilla report #%(name)s") class FedoraBZHandler(deskbar.Handler.Handler): def __init__(self): From fedora-extras-commits at redhat.com Fri Feb 3 00:44:11 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 2 Feb 2006 19:44:11 -0500 Subject: rpms/python-sqlite2/devel python-sqlite2.spec,1.4,1.5 Message-ID: <200602030044.k130ihOJ017521@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/python-sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17499 Modified Files: python-sqlite2.spec Log Message: python-sqlite2 in FC-4 was downgraded ??? Epoch had to be bumped. We need to do the same in development branch Index: python-sqlite2.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-sqlite2.spec 2 Feb 2006 10:34:56 -0000 1.4 +++ python-sqlite2.spec 3 Feb 2006 00:44:11 -0000 1.5 @@ -4,6 +4,7 @@ Name: python-sqlite2 Version: 2.1.3 Release: 2%{?dist} +Epoch: 1 Summary: DB-API 2.0 interface for SQLite 3.x Group: Development/Languages @@ -89,6 +90,10 @@ %changelog +* Fri Feb 3 2006 Dawid Gajownik - 1:2.1.3-2 +- python-sqlite2 in FC-4 was downgraded -> Epoch had to be bumped. + We need to do the same in development branch + * Thu Feb 2 2006 Dawid Gajownik - 2.1.3-2 - Run tests in %%check section From fedora-extras-commits at redhat.com Fri Feb 3 01:01:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:01:37 -0500 Subject: rpms/cone/FC-4 .cvsignore, 1.4, 1.5 cone.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200602030102.k1312HPM019380@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19341 Modified Files: .cvsignore cone.spec sources Log Message: Update to 0.65 (BZ#170361). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cone/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2005 00:15:58 -0000 1.4 +++ .cvsignore 3 Feb 2006 01:01:36 -0000 1.5 @@ -1 +1 @@ -cone-0.64.tar.bz2 +cone-0.65.tar.bz2 Index: cone.spec =================================================================== RCS file: /cvs/extras/rpms/cone/FC-4/cone.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cone.spec 2 Jun 2005 15:41:39 -0000 1.10 +++ cone.spec 3 Feb 2006 01:01:36 -0000 1.11 @@ -2,8 +2,8 @@ Summary: CONE mail reader Name: cone -Version: 0.64 -Release: 5 +Version: 0.65 +Release: 1%{?dist} URL: http://www.courier-mta.org/cone/ Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2 @@ -98,6 +98,9 @@ %doc cone/html %changelog +* Thu Aug 04 2005 Steven Pritchard 0.65-1 +- Update to 0.65 + * Thu Jun 2 2005 Michael Schwendt 0.64-5 - disable explicit gcc-c++/libstdc++-devel BR and bump for another rebuild attempt Index: sources =================================================================== RCS file: /cvs/extras/rpms/cone/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2005 00:15:58 -0000 1.4 +++ sources 3 Feb 2006 01:01:36 -0000 1.5 @@ -1 +1 @@ -0375a938da6347e42afd76135f334a6d cone-0.64.tar.bz2 +73ac17422c2dcf7a0a864b99fe786092 cone-0.65.tar.bz2 From fedora-extras-commits at redhat.com Fri Feb 3 01:12:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:12:45 -0500 Subject: rpms/cone/FC-4 cone-0.65.tar.bz2.sig, NONE, 1.1 cone-0.64.tar.bz2.sig, 1.1, NONE Message-ID: <200602030112.k131ClTj019463@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19453 Added Files: cone-0.65.tar.bz2.sig Removed Files: cone-0.64.tar.bz2.sig Log Message: Oops. Include .sig. --- NEW FILE cone-0.65.tar.bz2.sig --- ?? --- cone-0.64.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 01:19:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:19:07 -0500 Subject: rpms/cone/FC-4 cone.spec,1.11,1.12 Message-ID: <200602030119.k131Jd4V019561@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19544 Modified Files: cone.spec Log Message: Rebuild. Index: cone.spec =================================================================== RCS file: /cvs/extras/rpms/cone/FC-4/cone.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cone.spec 3 Feb 2006 01:01:36 -0000 1.11 +++ cone.spec 3 Feb 2006 01:19:06 -0000 1.12 @@ -3,7 +3,7 @@ Summary: CONE mail reader Name: cone Version: 0.65 -Release: 1%{?dist} +Release: 1.1%{?dist} URL: http://www.courier-mta.org/cone/ Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2 @@ -98,6 +98,9 @@ %doc cone/html %changelog +* Thu Feb 02 2006 Steven Pritchard 0.65-1.1 +- Rebuild + * Thu Aug 04 2005 Steven Pritchard 0.65-1 - Update to 0.65 From fedora-extras-commits at redhat.com Fri Feb 3 01:32:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:32:56 -0500 Subject: rpms/cone/devel cone-0.66.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.5, 1.6 cone.spec, 1.12, 1.13 sources, 1.5, 1.6 cone-0.65.tar.bz2.sig, 1.1, NONE Message-ID: <200602030133.k131XTZQ019686@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19664 Modified Files: .cvsignore cone.spec sources Added Files: cone-0.66.tar.bz2.sig Removed Files: cone-0.65.tar.bz2.sig Log Message: Update to 0.66. --- NEW FILE cone-0.66.tar.bz2.sig --- ?? ? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cone/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Aug 2005 13:20:36 -0000 1.5 +++ .cvsignore 3 Feb 2006 01:32:56 -0000 1.6 @@ -1 +1 @@ -cone-0.65.tar.bz2 +cone-0.66.tar.bz2 Index: cone.spec =================================================================== RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cone.spec 14 Nov 2005 17:03:34 -0000 1.12 +++ cone.spec 3 Feb 2006 01:32:56 -0000 1.13 @@ -1,22 +1,22 @@ %define curses_include_dir %{_includedir}/ncursesw -Summary: CONE mail reader -Name: cone -Version: 0.65 -Release: 2%{?dist} - -URL: http://www.courier-mta.org/cone/ -Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2 -Source1: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2.sig -License: GPL -Group: Applications/Internet -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot - -BuildRequires: aspell-devel libxml2-devel -BuildRequires: zlib-devel openssl-devel fam-devel perl -#BuildRequires: libstdc++-devel gcc-c++ -BuildRequires: openssl-perl -BuildRequires: ncurses-devel >= 5.3 +Summary: CONE mail reader +Name: cone +Version: 0.66 +Release: 1%{?dist} + +URL: http://www.courier-mta.org/cone/ +Source0: http://dl.sf.net/courier/%{name}-%{version}.tar.bz2 +Source1: http://dl.sf.net/courier/%{name}-%{version}.tar.bz2.sig +License: GPL +Group: Applications/Internet +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +BuildRequires: aspell-devel libxml2-devel +BuildRequires: zlib-devel openssl-devel fam-devel perl +#BuildRequires: libstdc++-devel gcc-c++ +BuildRequires: openssl-perl +BuildRequires: ncurses-devel >= 5.3 Requires(post): %{__perl} @@ -24,17 +24,17 @@ CONE is a simple, text-based E-mail reader and writer. %package devel -Group: Development/Libraries -Summary: LibMAIL mail client development library. -Requires: %{name} = %{version}-%{release} +Group: Development/Libraries +Summary: LibMAIL mail client development library. +Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package the header files and library files for developing application using LibMAIL - a high level, C++ OO library for mail clients. %package doc -Group: Documentation -Summary: Documentation for the CONE email client +Group: Documentation +Summary: Documentation for the CONE email client %description doc CONE is a simple, text-based E-mail reader and writer. This package @@ -47,12 +47,14 @@ CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}" export CPPFLAGS -CFLAGS="$RPM_OPT_FLAGS" %configure --with-devel +# Note: The build breaks with --disable-static +CFLAGS="$RPM_OPT_FLAGS" %configure --with-devel --enable-shared %{__make} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{__install} sysconftool $RPM_BUILD_ROOT%{_datadir}/cone/cone.sysconftool touch $RPM_BUILD_ROOT%{_sysconfdir}/cone @@ -85,6 +87,7 @@ %{_libexecdir}/cone %{_datadir}/cone %{_mandir}/man1/* +%{_libdir}/*.so %doc ABOUT-NLS ChangeLog README NEWS AUTHORS COPYING COPYING.GPL %files devel @@ -98,6 +101,13 @@ %doc cone/html %changelog +* Thu Feb 02 2006 Steven Pritchard 0.66-1 +- Update to 0.66 +- Spec cleanup (reformatting) + +* Mon Nov 14 2005 Steven Pritchard 0.65-3 +- Disable static library creation + * Mon Nov 14 2005 Steven Pritchard 0.65-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/cone/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Aug 2005 13:20:36 -0000 1.5 +++ sources 3 Feb 2006 01:32:56 -0000 1.6 @@ -1 +1 @@ -73ac17422c2dcf7a0a864b99fe786092 cone-0.65.tar.bz2 +0c924c109b31a632acd7e905fd415c58 cone-0.66.tar.bz2 --- cone-0.65.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 01:48:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:48:42 -0500 Subject: rpms/perl-Crypt-DES - New directory Message-ID: <200602030148.k131mi2i019799@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19791/perl-Crypt-DES Log Message: Directory /cvs/extras/rpms/perl-Crypt-DES added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 01:48:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:48:48 -0500 Subject: rpms/perl-Crypt-DES/devel - New directory Message-ID: <200602030148.k131mo3d019815@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19791/perl-Crypt-DES/devel Log Message: Directory /cvs/extras/rpms/perl-Crypt-DES/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 01:49:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:49:39 -0500 Subject: rpms/perl-Crypt-DES Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602030149.k131nfBL019851@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19839 Added Files: Makefile import.log Log Message: Setup of module perl-Crypt-DES --- NEW FILE Makefile --- # Top level Makefile for module perl-Crypt-DES all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 3 01:49:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:49:45 -0500 Subject: rpms/perl-Crypt-DES/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602030149.k131nlFR019873@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19839/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Crypt-DES --- NEW 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 Feb 3 01:50:49 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:50:49 -0500 Subject: rpms/perl-Crypt-DES import.log,1.1,1.2 Message-ID: <200602030151.k131pLKl019972@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19924 Modified Files: import.log Log Message: auto-import perl-Crypt-DES-2.05-1 on branch devel from perl-Crypt-DES-2.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DES/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Feb 2006 01:49:39 -0000 1.1 +++ import.log 3 Feb 2006 01:50:49 -0000 1.2 @@ -0,0 +1 @@ +perl-Crypt-DES-2_05-1:HEAD:perl-Crypt-DES-2.05-1.src.rpm:1138931442 From fedora-extras-commits at redhat.com Fri Feb 3 01:50:55 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:50:55 -0500 Subject: rpms/perl-Crypt-DES/devel perl-Crypt-DES.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602030151.k131pRln019982@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19924/devel Modified Files: .cvsignore sources Added Files: perl-Crypt-DES.spec Log Message: auto-import perl-Crypt-DES-2.05-1 on branch devel from perl-Crypt-DES-2.05-1.src.rpm --- NEW FILE perl-Crypt-DES.spec --- Name: perl-Crypt-DES Version: 2.05 Release: 1%{?dist} Summary: DES encryption module License: BSD-style Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-DES/ Source0: http://www.cpan.org/modules/by-module/Crypt/Crypt-DES-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Crypt::CBC) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description DES encryption module. %prep %setup -q -n Crypt-DES-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -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 COPYRIGHT README %{perl_vendorarch}/auto/Crypt/ %{perl_vendorarch}/Crypt/ %{_mandir}/man3/* %changelog * Thu Feb 02 2006 Steven Pritchard 2.05-1 - Update to 2.05. - Drop explicit Requires: perl(Crypt::CBC). - LD_RUN_PATH hack shouldn't be needed now. - Trim file list a bit. - License is BSD, more or less. * Sat Sep 17 2005 Steven Pritchard 2.03-2 - Minor spec cleanup. * Fri Aug 26 2005 Steven Pritchard 2.03-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DES/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Feb 2006 01:49:44 -0000 1.1 +++ .cvsignore 3 Feb 2006 01:50:55 -0000 1.2 @@ -0,0 +1 @@ +Crypt-DES-2.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DES/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Feb 2006 01:49:44 -0000 1.1 +++ sources 3 Feb 2006 01:50:55 -0000 1.2 @@ -0,0 +1 @@ +a8a0bea7064e11d2af434f3e468c17bb Crypt-DES-2.05.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 01:51:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 20:51:17 -0500 Subject: owners owners.list,1.599,1.600 Message-ID: <200602030151.k131pnaO020016@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19961 Modified Files: owners.list Log Message: Adding perl-Crypt-DES. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.599 retrieving revision 1.600 diff -u -r1.599 -r1.600 --- owners.list 2 Feb 2006 20:48:39 -0000 1.599 +++ owners.list 3 Feb 2006 01:51:17 -0000 1.600 @@ -792,6 +792,7 @@ 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-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 Fedora Extras|perl-Crypt-DES_EDE3|Crypt::DES_EDE3 Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-DH|Perl module implementing the Diffie-Hellman key exchange system|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-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 From fedora-extras-commits at redhat.com Fri Feb 3 02:25:48 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 2 Feb 2006 21:25:48 -0500 Subject: fedora-security/audit fc4,1.142,1.143 Message-ID: <200602030225.k132PmLD021974@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21956 Modified Files: fc4 Log Message: Note the mozilla and firefox updates. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- fc4 2 Feb 2006 21:12:05 -0000 1.142 +++ fc4 3 Feb 2006 02:25:34 -0000 1.143 @@ -22,8 +22,8 @@ CVE-2006-0297 version (firefox, 1.5 only) CVE-2006-0297 version (mozilla, 1.8 branch only) CVE-2006-0297 version (thunderbird, 1.5 only) -CVE-2006-0296 VULNERABLE (firefox) -CVE-2006-0296 VULNERABLE (mozilla) +CVE-2006-0296 backport (firefox) [since FEDORA-2006-076] +CVE-2006-0296 backport (mozilla) [since FEDORA-2006-075] CVE-2006-0296 VULNERABLE (thunderbird) CVE-2006-0295 version (firefox, 1.5 only) CVE-2006-0295 version (mozilla, 1.8 branch only) @@ -34,8 +34,8 @@ CVE-2006-0293 version (firefox, 1.5 only) CVE-2006-0293 version (mozilla, 1.8 branch only) CVE-2006-0293 version (thunderbird, 1.5 only) -CVE-2006-0292 VULNERABLE (firefox) -CVE-2006-0292 VULNERABLE (mozilla) +CVE-2006-0292 backport (firefox) [since FEDORA-2006-076] +CVE-2006-0292 backport (mozilla) [since FEDORA-2006-075] CVE-2006-0292 VULNERABLE (thunderbird) CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178 CVE-2006-0236 ignore (thunderbird) windows only flaw @@ -68,8 +68,8 @@ 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-4134 ignore (mozilla) http://www.mozilla.org/security/history-title.html -CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html +CVE-2005-4134 backport (mozilla) [since FEDORA-2006-075] +CVE-2005-4134 backport (firefox) [since FEDORA-2006-076] CVE-2005-4130 ** (HelixPlayer) no information available CVE-2005-4126 ** (HelixPlayer) no information available CVE-2005-4077 backport (curl) [since FEDORA-2005-1137] From fedora-extras-commits at redhat.com Fri Feb 3 02:49:31 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 2 Feb 2006 21:49:31 -0500 Subject: rpms/quilt/devel .cvsignore, 1.4, 1.5 quilt.spec, 1.8, 1.9 sources, 1.4, 1.5 quilt-fix-debuginfo.patch, 1.1, NONE Message-ID: <200602030250.k132o34f022086@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22060 Modified Files: .cvsignore quilt.spec sources Removed Files: quilt-fix-debuginfo.patch Log Message: Update to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Jul 2005 22:23:43 -0000 1.4 +++ .cvsignore 3 Feb 2006 02:49:30 -0000 1.5 @@ -1 +1 @@ -quilt-0.42.tar.gz +quilt-0.43.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/quilt.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- quilt.spec 28 Oct 2005 18:00:27 -0000 1.8 +++ quilt.spec 3 Feb 2006 02:49:30 -0000 1.9 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.42 -Release: 2%{?dist} +Version: 0.43 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +23,6 @@ Requires: util-linux Requires: tar Requires: rpm-build -Patch: quilt-fix-debuginfo.patch %description These scripts allow one to manage a series of patches by keeping track of the @@ -34,7 +33,6 @@ %prep %setup -%patch0 -p0 %build %configure --with-mta=%{_sbindir}/sendmail --with-diffstat=%{_bindir}/diffstat @@ -63,6 +61,10 @@ %{_mandir}/man1/* %changelog +* Thu Feb 2 2006 - jwboyer at jdub.homelinux.org 0.43-1 +- Update to latest upstream +- Drop fix-debuginfo patch (upstream) + * Fri Oct 28 2005 - jwboyer at jdub.homelinux.org 0.42-2 - fix debuginfo package (bug 171917) Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 22:23:43 -0000 1.4 +++ sources 3 Feb 2006 02:49:30 -0000 1.5 @@ -1 +1 @@ -c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz +a0bed88a3dbc0d2f25659bf9077c2515 quilt-0.43.tar.gz --- quilt-fix-debuginfo.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 02:50:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 21:50:22 -0500 Subject: rpms/perl-Crypt-DES_EDE3/devel perl-Crypt-DES_EDE3.spec,1.1,1.2 Message-ID: <200602030250.k132os2a022114@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22092 Modified Files: perl-Crypt-DES_EDE3.spec Log Message: Better Summary (BZ#168583). Index: perl-Crypt-DES_EDE3.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel/perl-Crypt-DES_EDE3.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DES_EDE3.spec 26 Jan 2006 21:21:54 -0000 1.1 +++ perl-Crypt-DES_EDE3.spec 3 Feb 2006 02:50:22 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Crypt-DES_EDE3 Version: 0.01 -Release: 2%{?dist} -Summary: Crypt::DES_EDE3 Perl module +Release: 3%{?dist} +Summary: Triple-DES EDE encryption/decryption module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-DES_EDE3/ @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 0.01-3 +- Better Summary (BZ#168583). + * Sat Sep 17 2005 Steven Pritchard 0.01-2 - Minor spec cleanup. - Include license files. From fedora-extras-commits at redhat.com Fri Feb 3 02:52:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 21:52:57 -0500 Subject: rpms/perl-Crypt-DES_EDE3/FC-3 perl-Crypt-DES_EDE3.spec,1.1,1.2 Message-ID: <200602030253.k132rT5K022193@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22176 Modified Files: perl-Crypt-DES_EDE3.spec Log Message: Better Summary (BZ#168583). Index: perl-Crypt-DES_EDE3.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/FC-3/perl-Crypt-DES_EDE3.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DES_EDE3.spec 26 Jan 2006 21:21:54 -0000 1.1 +++ perl-Crypt-DES_EDE3.spec 3 Feb 2006 02:52:57 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Crypt-DES_EDE3 Version: 0.01 -Release: 2%{?dist} -Summary: Crypt::DES_EDE3 Perl module +Release: 3%{?dist} +Summary: Triple-DES EDE encryption/decryption module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-DES_EDE3/ @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 0.01-3 +- Better Summary (BZ#168583). + * Sat Sep 17 2005 Steven Pritchard 0.01-2 - Minor spec cleanup. - Include license files. From fedora-extras-commits at redhat.com Fri Feb 3 02:53:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 21:53:33 -0500 Subject: rpms/perl-Crypt-DES_EDE3/FC-4 perl-Crypt-DES_EDE3.spec,1.1,1.2 Message-ID: <200602030254.k132s68x022216@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22199 Modified Files: perl-Crypt-DES_EDE3.spec Log Message: Better Summary (BZ#168583). Index: perl-Crypt-DES_EDE3.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/FC-4/perl-Crypt-DES_EDE3.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DES_EDE3.spec 26 Jan 2006 21:21:54 -0000 1.1 +++ perl-Crypt-DES_EDE3.spec 3 Feb 2006 02:53:33 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Crypt-DES_EDE3 Version: 0.01 -Release: 2%{?dist} -Summary: Crypt::DES_EDE3 Perl module +Release: 3%{?dist} +Summary: Triple-DES EDE encryption/decryption module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-DES_EDE3/ @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 0.01-3 +- Better Summary (BZ#168583). + * Sat Sep 17 2005 Steven Pritchard 0.01-2 - Minor spec cleanup. - Include license files. From fedora-extras-commits at redhat.com Fri Feb 3 03:16:40 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 22:16:40 -0500 Subject: rpms/perl-Convert-PEM/devel perl-Convert-PEM.spec,1.1,1.2 Message-ID: <200602030317.k133HCKL024118@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Convert-PEM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24098 Modified Files: perl-Convert-PEM.spec Log Message: Better Summary. Index: perl-Convert-PEM.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-PEM/devel/perl-Convert-PEM.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Convert-PEM.spec 26 Jan 2006 21:23:46 -0000 1.1 +++ perl-Convert-PEM.spec 3 Feb 2006 03:16:39 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Convert-PEM Version: 0.07 -Release: 2%{?dist} -Summary: Convert::PEM Perl module +Release: 3%{?dist} +Summary: Read/write encrypted ASN.1 PEM files License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-PEM/ @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 0.07-3 +- Better Summary. + * Sat Sep 17 2005 Steven Pritchard 0.07-2 - Remove explicit core module dependencies. - Include license files. From fedora-extras-commits at redhat.com Fri Feb 3 03:17:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 22:17:16 -0500 Subject: rpms/perl-Convert-PEM/FC-3 perl-Convert-PEM.spec,1.1,1.2 Message-ID: <200602030317.k133HmLe024141@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Convert-PEM/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24124 Modified Files: perl-Convert-PEM.spec Log Message: Better Summary. Index: perl-Convert-PEM.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-PEM/FC-3/perl-Convert-PEM.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Convert-PEM.spec 26 Jan 2006 21:23:46 -0000 1.1 +++ perl-Convert-PEM.spec 3 Feb 2006 03:17:16 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Convert-PEM Version: 0.07 -Release: 2%{?dist} -Summary: Convert::PEM Perl module +Release: 3%{?dist} +Summary: Read/write encrypted ASN.1 PEM files License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-PEM/ @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 0.07-3 +- Better Summary. + * Sat Sep 17 2005 Steven Pritchard 0.07-2 - Remove explicit core module dependencies. - Include license files. From fedora-extras-commits at redhat.com Fri Feb 3 03:17:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 22:17:52 -0500 Subject: rpms/perl-Convert-PEM/FC-4 perl-Convert-PEM.spec,1.1,1.2 Message-ID: <200602030318.k133IOZc024164@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Convert-PEM/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24147 Modified Files: perl-Convert-PEM.spec Log Message: Better Summary. Index: perl-Convert-PEM.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Convert-PEM/FC-4/perl-Convert-PEM.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Convert-PEM.spec 26 Jan 2006 21:23:46 -0000 1.1 +++ perl-Convert-PEM.spec 3 Feb 2006 03:17:52 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Convert-PEM Version: 0.07 -Release: 2%{?dist} -Summary: Convert::PEM Perl module +Release: 3%{?dist} +Summary: Read/write encrypted ASN.1 PEM files License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-PEM/ @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Feb 02 2006 Steven Pritchard 0.07-3 +- Better Summary. + * Sat Sep 17 2005 Steven Pritchard 0.07-2 - Remove explicit core module dependencies. - Include license files. From fedora-extras-commits at redhat.com Fri Feb 3 03:25:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 22:25:51 -0500 Subject: rpms/amavisd-new/devel amavisd-new.spec,1.1,1.2 Message-ID: <200602030326.k133QNNS024328@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/amavisd-new/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24307 Modified Files: amavisd-new.spec Log Message: Add dist to Release. Index: amavisd-new.spec =================================================================== RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amavisd-new.spec 26 Jan 2006 22:11:54 -0000 1.1 +++ amavisd-new.spec 3 Feb 2006 03:25:51 -0000 1.2 @@ -3,7 +3,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavisd-new Version: 2.3.3 -Release: 4%{?prerelease:.%{prerelease}} +Release: 5%{?prerelease:.%{prerelease}}%{?dist} License: GPL Group: Applications/System URL: http://www.ijs.si/software/amavisd/ @@ -146,6 +146,9 @@ %ghost /var/spool/amavisd/clamd.sock %changelog +* Thu Feb 02 2006 Steven Pritchard 2.3.3-5 +- Add dist to Release + * Wed Sep 21 2005 Steven Pritchard 2.3.3-4 - Add TODO and amavisd.conf-* to %%doc From fedora-extras-commits at redhat.com Fri Feb 3 03:26:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 22:26:54 -0500 Subject: rpms/amavisd-new/FC-4 amavisd-new.spec,1.1,1.2 Message-ID: <200602030327.k133RTvA024395@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/amavisd-new/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24376 Modified Files: amavisd-new.spec Log Message: Add dist to Release. Index: amavisd-new.spec =================================================================== RCS file: /cvs/extras/rpms/amavisd-new/FC-4/amavisd-new.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amavisd-new.spec 26 Jan 2006 22:11:54 -0000 1.1 +++ amavisd-new.spec 3 Feb 2006 03:26:54 -0000 1.2 @@ -3,7 +3,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavisd-new Version: 2.3.3 -Release: 4%{?prerelease:.%{prerelease}} +Release: 5%{?prerelease:.%{prerelease}}%{?dist} License: GPL Group: Applications/System URL: http://www.ijs.si/software/amavisd/ @@ -146,6 +146,9 @@ %ghost /var/spool/amavisd/clamd.sock %changelog +* Thu Feb 02 2006 Steven Pritchard 2.3.3-5 +- Add dist to Release + * Wed Sep 21 2005 Steven Pritchard 2.3.3-4 - Add TODO and amavisd.conf-* to %%doc From fedora-extras-commits at redhat.com Fri Feb 3 03:27:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Feb 2006 22:27:45 -0500 Subject: rpms/amavisd-new/FC-3 amavisd-new.spec,1.1,1.2 Message-ID: <200602030328.k133SHKg024462@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/amavisd-new/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24439 Modified Files: amavisd-new.spec Log Message: Add dist to Release. Index: amavisd-new.spec =================================================================== RCS file: /cvs/extras/rpms/amavisd-new/FC-3/amavisd-new.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amavisd-new.spec 26 Jan 2006 22:11:54 -0000 1.1 +++ amavisd-new.spec 3 Feb 2006 03:27:45 -0000 1.2 @@ -3,7 +3,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavisd-new Version: 2.3.3 -Release: 4%{?prerelease:.%{prerelease}} +Release: 5%{?prerelease:.%{prerelease}}%{?dist} License: GPL Group: Applications/System URL: http://www.ijs.si/software/amavisd/ @@ -146,6 +146,9 @@ %ghost /var/spool/amavisd/clamd.sock %changelog +* Thu Feb 02 2006 Steven Pritchard 2.3.3-5 +- Add dist to Release + * Wed Sep 21 2005 Steven Pritchard 2.3.3-4 - Add TODO and amavisd.conf-* to %%doc From fedora-extras-commits at redhat.com Fri Feb 3 03:36:51 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 2 Feb 2006 22:36:51 -0500 Subject: rpms/quilt/FC-4 .cvsignore, 1.4, 1.5 quilt.spec, 1.8, 1.9 sources, 1.4, 1.5 quilt-fix-debuginfo.patch, 1.1, NONE Message-ID: <200602030337.k133bORY024568@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24547 Modified Files: .cvsignore quilt.spec sources Removed Files: quilt-fix-debuginfo.patch Log Message: Update to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Jul 2005 22:23:42 -0000 1.4 +++ .cvsignore 3 Feb 2006 03:36:51 -0000 1.5 @@ -1 +1 @@ -quilt-0.42.tar.gz +quilt-0.43.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/quilt.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- quilt.spec 28 Oct 2005 18:00:22 -0000 1.8 +++ quilt.spec 3 Feb 2006 03:36:51 -0000 1.9 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.42 -Release: 2%{?dist} +Version: 0.43 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +23,6 @@ Requires: util-linux Requires: tar Requires: rpm-build -Patch: quilt-fix-debuginfo.patch %description These scripts allow one to manage a series of patches by keeping track of the @@ -34,7 +33,6 @@ %prep %setup -%patch0 -p0 %build %configure --with-mta=%{_sbindir}/sendmail --with-diffstat=%{_bindir}/diffstat @@ -63,6 +61,10 @@ %{_mandir}/man1/* %changelog +* Thu Feb 2 2006 - jwboyer at jdub.homelinux.org 0.43-1 +- Update to latest upstream +- Drop fix-debuginfo patch (upstream) + * Fri Oct 28 2005 - jwboyer at jdub.homelinux.org 0.42-2 - fix debuginfo package (bug 171917) Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 22:23:42 -0000 1.4 +++ sources 3 Feb 2006 03:36:51 -0000 1.5 @@ -1 +1 @@ -c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz +a0bed88a3dbc0d2f25659bf9077c2515 quilt-0.43.tar.gz --- quilt-fix-debuginfo.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 03:38:36 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 2 Feb 2006 22:38:36 -0500 Subject: rpms/quilt/FC-3 .cvsignore, 1.4, 1.5 quilt.spec, 1.8, 1.9 sources, 1.4, 1.5 quilt-fix-debuginfo.patch, 1.1, NONE Message-ID: <200602030339.k133d9So024643@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24617 Modified Files: .cvsignore quilt.spec sources Removed Files: quilt-fix-debuginfo.patch Log Message: Update to latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Jul 2005 22:23:41 -0000 1.4 +++ .cvsignore 3 Feb 2006 03:38:36 -0000 1.5 @@ -1 +1 @@ -quilt-0.42.tar.gz +quilt-0.43.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/quilt.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- quilt.spec 28 Oct 2005 18:00:16 -0000 1.8 +++ quilt.spec 3 Feb 2006 03:38:36 -0000 1.9 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.42 -Release: 2%{?dist} +Version: 0.43 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +23,6 @@ Requires: util-linux Requires: tar Requires: rpm-build -Patch: quilt-fix-debuginfo.patch %description These scripts allow one to manage a series of patches by keeping track of the @@ -34,7 +33,6 @@ %prep %setup -%patch0 -p0 %build %configure --with-mta=%{_sbindir}/sendmail --with-diffstat=%{_bindir}/diffstat @@ -63,6 +61,10 @@ %{_mandir}/man1/* %changelog +* Thu Feb 2 2006 - jwboyer at jdub.homelinux.org 0.43-1 +- Update to latest upstream +- Drop fix-debuginfo patch (upstream) + * Fri Oct 28 2005 - jwboyer at jdub.homelinux.org 0.42-2 - fix debuginfo package (bug 171917) Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2005 22:23:41 -0000 1.4 +++ sources 3 Feb 2006 03:38:36 -0000 1.5 @@ -1 +1 @@ -c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz +a0bed88a3dbc0d2f25659bf9077c2515 quilt-0.43.tar.gz --- quilt-fix-debuginfo.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 03:48:26 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Thu, 2 Feb 2006 22:48:26 -0500 Subject: rpms/libapreq2/devel libapreq2.spec,1.6,1.7 Message-ID: <200602030348.k133mx2e024750@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24727 Modified Files: libapreq2.spec Log Message: Bump up to 2.07-rc4. Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libapreq2.spec 10 Dec 2005 20:37:21 -0000 1.6 +++ libapreq2.spec 3 Feb 2006 03:48:26 -0000 1.7 @@ -2,14 +2,14 @@ Name: libapreq2 Version: 2.07 -Release: 0.2.rc3%{?dist} +Release: 0.1.rc4%{?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-rc3.tar.gz +Source0: http://people.apache.org/~joes/libapreq2-2.07-rc4.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-build.patch Patch1: %{name}-2.07-rc3-ldflags.patch @@ -153,6 +153,9 @@ %changelog +* 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 - Filter unversioned perl(*) provides for which a versioned one exists. From fedora-extras-commits at redhat.com Fri Feb 3 05:10:34 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 3 Feb 2006 00:10:34 -0500 Subject: rpms/eet/FC-4 .cvsignore,1.3,1.4 eet.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200602030511.k135B6sf028507@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/eet/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28469/FC-4 Modified Files: .cvsignore eet.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eet/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Nov 2005 10:08:56 -0000 1.3 +++ .cvsignore 3 Feb 2006 05:10:33 -0000 1.4 @@ -1 +1 @@ -eet-0.9.10.018.tar.gz +eet-0.9.10.023.tar.gz Index: eet.spec =================================================================== RCS file: /cvs/extras/rpms/eet/FC-4/eet.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eet.spec 11 Nov 2005 10:08:56 -0000 1.4 +++ eet.spec 3 Feb 2006 05:10:33 -0000 1.5 @@ -1,13 +1,12 @@ Name: eet -Version: 0.9.10.018 -Release: 2%{?dist} +Version: 0.9.10.023 +Release: 1%{?dist} Summary: A library designed to write an arbitary set of chunks of data to a file Group: System Environment/Libraries License: MIT -URL: http://www.enlightenment.org/index.php?id=24 -# http://enlightenment.freedesktop.org/fetch.php?file=%{name}-%{version}.tar.gz -Source0: %{name}-%{version}.tar.gz +URL: http://www.enlightenment.org/Libraries/Eet/ +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz Patch: %{name}-0.9.10.018-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libjpeg-devel @@ -50,6 +49,7 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING-PLAIN README %{_bindir}/eet +%{_bindir}/eet_bench %{_libdir}/libeet.so.* %files devel @@ -60,6 +60,9 @@ %{_libdir}/pkgconfig/eet.pc %changelog +* Fri Feb 3 2006 Ignacio Vazquez-Abrams 0.9.10.023-1 +- Upstream update + * Wed Nov 11 2005 Ignacio Vazquez-Abrams 0.9.10.018-2 - Build with proper sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/eet/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Nov 2005 10:08:56 -0000 1.3 +++ sources 3 Feb 2006 05:10:33 -0000 1.4 @@ -1 +1 @@ -69bb1d1f5771c1b2e0ea54d87ec20582 eet-0.9.10.018.tar.gz +d1862511bc2798747b85a2386fb2105a eet-0.9.10.023.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 05:10:58 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 3 Feb 2006 00:10:58 -0500 Subject: rpms/eet/devel .cvsignore,1.3,1.4 eet.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200602030511.k135BUwd028512@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/eet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28469/devel Modified Files: .cvsignore eet.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eet/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Nov 2005 10:09:03 -0000 1.3 +++ .cvsignore 3 Feb 2006 05:10:58 -0000 1.4 @@ -1 +1 @@ -eet-0.9.10.018.tar.gz +eet-0.9.10.023.tar.gz Index: eet.spec =================================================================== RCS file: /cvs/extras/rpms/eet/devel/eet.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eet.spec 11 Nov 2005 10:09:03 -0000 1.4 +++ eet.spec 3 Feb 2006 05:10:58 -0000 1.5 @@ -1,13 +1,12 @@ Name: eet -Version: 0.9.10.018 -Release: 2%{?dist} +Version: 0.9.10.023 +Release: 1%{?dist} Summary: A library designed to write an arbitary set of chunks of data to a file Group: System Environment/Libraries License: MIT -URL: http://www.enlightenment.org/index.php?id=24 -# http://enlightenment.freedesktop.org/fetch.php?file=%{name}-%{version}.tar.gz -Source0: %{name}-%{version}.tar.gz +URL: http://www.enlightenment.org/Libraries/Eet/ +Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz Patch: %{name}-0.9.10.018-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libjpeg-devel @@ -50,6 +49,7 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING-PLAIN README %{_bindir}/eet +%{_bindir}/eet_bench %{_libdir}/libeet.so.* %files devel @@ -60,6 +60,9 @@ %{_libdir}/pkgconfig/eet.pc %changelog +* Fri Feb 3 2006 Ignacio Vazquez-Abrams 0.9.10.023-1 +- Upstream update + * Wed Nov 11 2005 Ignacio Vazquez-Abrams 0.9.10.018-2 - Build with proper sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/eet/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Nov 2005 10:09:03 -0000 1.3 +++ sources 3 Feb 2006 05:10:58 -0000 1.4 @@ -1 +1 @@ -69bb1d1f5771c1b2e0ea54d87ec20582 eet-0.9.10.018.tar.gz +d1862511bc2798747b85a2386fb2105a eet-0.9.10.023.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 05:34:10 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 3 Feb 2006 00:34:10 -0500 Subject: rpms/eet/FC-4 eet-0.9.10.023-gcc4.patch, NONE, 1.1 eet.spec, 1.5, 1.6 eet-0.9.10.018-gcc4.patch, 1.1, NONE Message-ID: <200602030534.k135YgXd028697@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/eet/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28659/FC-4 Modified Files: eet.spec Added Files: eet-0.9.10.023-gcc4.patch Removed Files: eet-0.9.10.018-gcc4.patch Log Message: Fix the patch eet-0.9.10.023-gcc4.patch: --- NEW FILE eet-0.9.10.023-gcc4.patch --- --- eet-0.9.10.023/src/lib/eet_lib.c.gcc4 2006-01-10 02:36:37.000000000 -0500 +++ eet-0.9.10.023/src/lib/eet_lib.c 2006-02-03 00:27:36.000000000 -0500 @@ -225,7 +225,7 @@ eet_hash_gen(char *key, int hash_size) { int hash_num = 0, i; - unsigned char *ptr; + char *ptr; const int masks[9] = { 0x00, @@ -497,7 +497,7 @@ if ((mode == EET_FILE_MODE_READ) || (mode == EET_FILE_MODE_READ_WRITE)) { unsigned char buf[12]; - unsigned char *dyn_buf, *p; + char *dyn_buf, *p; unsigned long int i1, i2; int num_entries, byte_entries, i; size_t count; @@ -591,7 +591,7 @@ int flags; int size; int data_size; - int name_size; + size_t name_size; int hash; Eet_File_Node *efn; void *data = NULL; Index: eet.spec =================================================================== RCS file: /cvs/extras/rpms/eet/FC-4/eet.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eet.spec 3 Feb 2006 05:10:33 -0000 1.5 +++ eet.spec 3 Feb 2006 05:34:09 -0000 1.6 @@ -7,7 +7,7 @@ License: MIT URL: http://www.enlightenment.org/Libraries/Eet/ Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz -Patch: %{name}-0.9.10.018-gcc4.patch +Patch: eet-0.9.10.023-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libjpeg-devel --- eet-0.9.10.018-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 05:34:15 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 3 Feb 2006 00:34:15 -0500 Subject: rpms/eet/devel eet-0.9.10.023-gcc4.patch, NONE, 1.1 eet.spec, 1.5, 1.6 eet-0.9.10.018-gcc4.patch, 1.1, NONE Message-ID: <200602030534.k135YmX9028700@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/eet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28659/devel Modified Files: eet.spec Added Files: eet-0.9.10.023-gcc4.patch Removed Files: eet-0.9.10.018-gcc4.patch Log Message: Fix the patch eet-0.9.10.023-gcc4.patch: --- NEW FILE eet-0.9.10.023-gcc4.patch --- --- eet-0.9.10.023/src/lib/eet_lib.c.gcc4 2006-01-10 02:36:37.000000000 -0500 +++ eet-0.9.10.023/src/lib/eet_lib.c 2006-02-03 00:27:36.000000000 -0500 @@ -225,7 +225,7 @@ eet_hash_gen(char *key, int hash_size) { int hash_num = 0, i; - unsigned char *ptr; + char *ptr; const int masks[9] = { 0x00, @@ -497,7 +497,7 @@ if ((mode == EET_FILE_MODE_READ) || (mode == EET_FILE_MODE_READ_WRITE)) { unsigned char buf[12]; - unsigned char *dyn_buf, *p; + char *dyn_buf, *p; unsigned long int i1, i2; int num_entries, byte_entries, i; size_t count; @@ -591,7 +591,7 @@ int flags; int size; int data_size; - int name_size; + size_t name_size; int hash; Eet_File_Node *efn; void *data = NULL; Index: eet.spec =================================================================== RCS file: /cvs/extras/rpms/eet/devel/eet.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eet.spec 3 Feb 2006 05:10:58 -0000 1.5 +++ eet.spec 3 Feb 2006 05:34:15 -0000 1.6 @@ -7,7 +7,7 @@ License: MIT URL: http://www.enlightenment.org/Libraries/Eet/ Source0: http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz -Patch: %{name}-0.9.10.018-gcc4.patch +Patch: eet-0.9.10.023-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libjpeg-devel --- eet-0.9.10.018-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 06:58:48 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Fri, 3 Feb 2006 01:58:48 -0500 Subject: owners owners.list,1.600,1.601 Message-ID: <200602030659.k136xLgr030682@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30665 Modified Files: owners.list Log Message: Remove nonexistent xaliclock package Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.600 retrieving revision 1.601 diff -u -r1.600 -r1.601 --- owners.list 3 Feb 2006 01:51:17 -0000 1.600 +++ owners.list 3 Feb 2006 06:58:48 -0000 1.601 @@ -1333,7 +1333,6 @@ Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org| Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org| Fedora Extras|x3270|An X Window System based IBM 3278/3279 terminal emulator|karsten at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|xaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|xbase|XBase compatible database library and tools|tcallawa at redhat.com|extras-qa at fedoraproject.org| 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 Fri Feb 3 08:17:12 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 3 Feb 2006 03:17:12 -0500 Subject: rpms/leafpad/devel .cvsignore, 1.7, 1.8 leafpad.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200602030817.k138HjYw002170@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/leafpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2149 Modified Files: .cvsignore leafpad.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/leafpad/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 Nov 2005 14:34:40 -0000 1.7 +++ .cvsignore 3 Feb 2006 08:17:12 -0000 1.8 @@ -1 +1 @@ -leafpad-0.8.5.tar.gz +leafpad-0.8.7.tar.gz Index: leafpad.spec =================================================================== RCS file: /cvs/extras/rpms/leafpad/devel/leafpad.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- leafpad.spec 27 Nov 2005 14:34:40 -0000 1.15 +++ leafpad.spec 3 Feb 2006 08:17:12 -0000 1.16 @@ -1,5 +1,5 @@ Name: leafpad -Version: 0.8.5 +Version: 0.8.7 Release: 1%{?dist} Summary: GTK+ based simple text editor @@ -55,8 +55,12 @@ %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop %{_datadir}/pixmaps/%{name}.png +%exclude %{_datadir}/pixmaps/%{name}.xpm %changelog +* Fri Feb 3 2006 Ignacio Vazquez-Abrams 0.8.7-1 +- Upstream update + * Sat Nov 27 2005 Ignacio Vazquez-Abrams 0.8.5-1 - Upstream update Index: sources =================================================================== RCS file: /cvs/extras/rpms/leafpad/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 27 Nov 2005 14:34:40 -0000 1.7 +++ sources 3 Feb 2006 08:17:12 -0000 1.8 @@ -1 +1 @@ -aba4d6d93375c013c71601c10df29a9c leafpad-0.8.5.tar.gz +6dd5a0882a289a5351b08618883427a1 leafpad-0.8.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 08:45:36 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 3 Feb 2006 03:45:36 -0500 Subject: fedora-security/audit fc4,1.143,1.144 fc5,1.52,1.53 Message-ID: <200602030845.k138jaQk002349@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2329 Modified Files: fc4 fc5 Log Message: Deal with FC4 kernel update Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- fc4 3 Feb 2006 02:25:34 -0000 1.143 +++ fc4 3 Feb 2006 08:45:28 -0000 1.144 @@ -1,11 +1,12 @@ -Up to date CVE as of CVE email 20060130 -Up to date FC4 as of 20060122 +Up to date CVE as of CVE email 20060202 +Up to date FC4 as of 20060202 ** are items that need attention +CVE-2006-0528 **evolution CVE-2006-0496 VULNERABLE (mozilla) CVE-2006-0496 VULNERABLE (firefox) -CVE-2006-0482 ** kernel +CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) CVE-2006-0405 version (libtiff, 3.8.0 only) CVE-2006-0369 ignore (mysql) this is not a security issue @@ -48,19 +49,20 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 VULNERABLE (kernel) CVE-2006-0082 version (ImageMagick, not 6.2.2.0) -CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15) -CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) -CVE-2006-0035 VULNERABLE (kernel) +CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2 +CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2 +CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.2 CVE-2006-0019 backport (kdelibs) [since FEDORA-2006-050] CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4685 VULNERABLE (mozilla) +CVE-2005-4685 VULNERABLE (firefox) CVE-2005-4684 VULNERABLE (kdebase) CVE-2005-4667 VULNERABLE (unzip) bz#178961 -CVE-2005-4639 VULNERABLE (kernel) +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 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013] -CVE-2005-4618 verson (kernel, fixed 2.6.15) [since FEDORA-2006-013] -CVE-2005-4605 backport (kernel) [since FEDORA-2006-013] +CVE-2005-4635 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2006-013 +CVE-2005-4618 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2006-013 +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] @@ -79,17 +81,17 @@ CVE-2005-3896 ignore (mozilla) recoverable DoS only CVE-2005-3883 VULNERABLE (php) CVE-2005-3858 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] -CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15) +CVE-2005-3857 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] CVE-2005-3848 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] CVE-2005-3847 version (kernel, fixed 2.6.12.6) [since FEDORA-2005-949] was backport since [FEDORA-2005-906] -CVE-2005-3810 backport (kernel, fixed 2.6.15) [since FEDORA-2005-1104] affects 2.6.14 only [vulnerable since FEDORA-2005-1067] -CVE-2005-3809 backport (kernel, fixed 2.6.15) [since FEDORA-2005-1104] affects 2.6.14 only [vulnerable since FEDORA-2005-1067] -CVE-2005-3808 backport (kernel) [since FEDORA-2005-1104] -CVE-2005-3807 backport (kernel) [since FEDORA-2005-1104] +CVE-2005-3810 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2005-1104 affects 2.6.14 only [vulnerable since FEDORA-2005-1067] +CVE-2005-3809 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2005-1104 affects 2.6.14 only [vulnerable since FEDORA-2005-1067] +CVE-2005-3808 version (kernel, fixed 2.6.15) was backport since FEDORA-2005-1104 +CVE-2005-3807 version (kernel, fixed 2.6.15) was backport since FEDORA-2005-1104 CVE-2005-3806 version (kernel, fixed 2.6.14) [since FEDORA-2005-1067] CVE-2005-3805 version (kernel, fixed 2.6.14) [since FEDORA-2005-1067] -CVE-2005-3784 backport (kernel, fixed 2.6.15) [since FEDORA-2005-3784] -CVE-2005-3783 backport (kernel, fixed 2.6.14.2) [since FEDORA-2005-1104] +CVE-2005-3784 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2005-3784 +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 @@ -125,7 +127,7 @@ CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160] CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] CVE-2005-3624 backport (cups) [since FEDORA-2006-010] -CVE-2005-3623 backport (kernel, fixed 2.6.14.5) [since FEDORA-2006-013] +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-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067] @@ -137,7 +139,7 @@ CVE-2005-3388 backport (php) [since FEDORA-2005-1062] CVE-2005-3358 version (kernel, fixed 2.6.11) CVE-2005-3357 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052] -CVE-2005-3356 VULNERABLE (kernel) +CVE-2005-3356 backport (kernel) [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] @@ -152,7 +154,7 @@ CVE-2005-3272 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] CVE-2005-3271 version (kernel, fixed 2.6.9) since GA CVE-2005-3258 backport (squid) [since FEDORA-2005-1009] -CVE-2005-3257 backport (kernel, fixed 2.6.15) [since FEDORA-2005-1138] +CVE-2005-3257 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2005-1138 CVE-2005-3249 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] CVE-2005-3248 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] CVE-2005-3247 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] @@ -238,7 +240,7 @@ CVE-2005-2794 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] was backport since FEDORA-2005-851 CVE-2005-2728 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] CVE-2005-2710 version (helixplayer, fixed 1.0.6) [since FEDORA-2005-940] -CVE-2005-2709 backport (kernel, fixed 2.6.14.3) [since FEDORA-2005-1104] +CVE-2005-2709 version (kernel, fixed 2.6.14.3) [since FEDORA-2006-077] was backport since FEDORA-2005-1104 CVE-2005-2708 ignore (kernel) not reproducable on x86_64 CVE-2005-2707 version (thunderbird) [since FEDORA-2005-963] CVE-2005-2707 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] @@ -1332,7 +1334,7 @@ CVE-2002-2204 ignore (rpm) by design CVE-2002-2196 version (samba, fixed 2.2.5) -CVE-2002-2185 VULNERABLE (kernel) +CVE-2002-2185 version (kernel, fixed 2.6.15) [since FEODRA-2006-077] CVE-2002-2103 version (apache, not 2.0) CVE-2002-1963 version (kernel, not 2.6) CVE-2002-1976 ignore (ifconfig) "use ip" Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- fc5 2 Feb 2006 21:12:05 -0000 1.52 +++ fc5 3 Feb 2006 08:45:28 -0000 1.53 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060130 +Up to date CVE as of CVE email 20060202 Up to date FC5 as of FC5-Test2-RC 1. Removed packages with security issues that are no longer in FC5 @@ -15,9 +15,10 @@ ** are items that need attention +CVE-2006-0528 **evolution CVE-2006-0496 VULNERABLE (mozilla) CVE-2006-0496 VULNERABLE (firefox) -CVE-2006-0482 ** kernel +CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) CVE-2006-0405 version (libtiff, 3.8.0 only) CVE-2006-0369 ignore (mysql) this is not a security issue @@ -25,28 +26,28 @@ CVE-2006-0301 VULNERABLE (xpdf) bz#179423 CVE-2006-0301 VULNERABLE (poppler) bz#179424 CVE-2006-0301 VULNERABLE (kdegraphics) bz#179425 -CVE-2006-0299 VULNERABLE (firefox) +CVE-2006-0299 VULNERABLE (firefox, fixed 1.5.0.1) CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 VULNERABLE (thunderbird) -CVE-2006-0298 VULNERABLE (firefox) +CVE-2006-0298 VULNERABLE (firefox, fixed 1.5.0.1) CVE-2006-0298 version (mozilla, 1.8 branch only) CVE-2006-0298 VULNERABLE (thunderbird) -CVE-2006-0297 VULNERABLE (firefox) +CVE-2006-0297 VULNERABLE (firefox, fixed 1.5.0.1) CVE-2006-0297 version (mozilla, 1.8 branch only) CVE-2006-0297 VULNERABLE (thunderbird) -CVE-2006-0296 VULNERABLE (firefox) +CVE-2006-0296 VULNERABLE (firefox, fixed 1.5.0.1) CVE-2006-0296 VULNERABLE (mozilla) CVE-2006-0296 VULNERABLE (thunderbird) -CVE-2006-0295 VULNERABLE (firefox) +CVE-2006-0295 VULNERABLE (firefox, fixed 1.5.0.1) CVE-2006-0295 version (mozilla, 1.8 branch only) CVE-2006-0295 VULNERABLE (thunderbird) -CVE-2006-0294 VULNERABLE (firefox) +CVE-2006-0294 VULNERABLE (firefox, fixed 1.5.0.1) CVE-2006-0294 version (mozilla, 1.8 branch only) CVE-2006-0294 VULNERABLE (thunderbird) -CVE-2006-0293 VULNERABLE (firefox) +CVE-2006-0293 VULNERABLE (firefox, fixed 1.5.0.1) CVE-2006-0293 version (mozilla, 1.8 branch only) CVE-2006-0293 VULNERABLE (thunderbird) -CVE-2006-0292 VULNERABLE (firefox) +CVE-2006-0292 VULNERABLE (firefox, fixed 1.5.1) CVE-2006-0292 VULNERABLE (mozilla) CVE-2006-0292 VULNERABLE (thunderbird) CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179 @@ -67,6 +68,7 @@ CVE-2006-0019 VULNERABLE (kdelibs) CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4685 VULNERABLE (mozilla) +CVE-2005-4685 VULNERABLE (firefox) CVE-2005-4684 VULNERABLE (kdebase) CVE-2005-4667 VULNERABLE (unzip) bz#178961 CVE-2005-4639 version (kernel, fixed 2.6.15) From fedora-extras-commits at redhat.com Fri Feb 3 08:52:31 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 03:52:31 -0500 Subject: rpms/libetpan/FC-3 .cvsignore, 1.6, 1.7 libetpan.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200602030853.k138r3te002424@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2369/FC-3 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 Dec 2005 09:21:16 -0000 1.6 +++ .cvsignore 3 Feb 2006 08:52:31 -0000 1.7 @@ -1 +1 @@ -libetpan-0.41.tar.gz +libetpan-0.42.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libetpan.spec 25 Dec 2005 09:21:16 -0000 1.5 +++ libetpan.spec 3 Feb 2006 08:52:31 -0000 1.6 @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.41 +Version: 0.42 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q -n %{name}-0.41 +%setup -q %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.0.1 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Feb 03 2006 Andreas Bierfert +0.42-1 +- version upgrade + * Sun Dec 25 2005 Andreas Bierfert 0.41-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Dec 2005 09:21:16 -0000 1.6 +++ sources 3 Feb 2006 08:52:31 -0000 1.7 @@ -1 +1 @@ -62fd85dc7d38f7586073b469278ee58e libetpan-0.41.tar.gz +269c275151bbb9c3e818b58863cca670 libetpan-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 08:52:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 03:52:38 -0500 Subject: rpms/libetpan/FC-4 .cvsignore, 1.6, 1.7 libetpan.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200602030853.k138rAWc002429@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2369/FC-4 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 Dec 2005 09:21:24 -0000 1.6 +++ .cvsignore 3 Feb 2006 08:52:37 -0000 1.7 @@ -1 +1 @@ -libetpan-0.41.tar.gz +libetpan-0.42.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libetpan.spec 25 Dec 2005 09:21:24 -0000 1.5 +++ libetpan.spec 3 Feb 2006 08:52:37 -0000 1.6 @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.41 +Version: 0.42 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q -n %{name}-0.41 +%setup -q %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.0.1 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Feb 03 2006 Andreas Bierfert +0.42-1 +- version upgrade + * Sun Dec 25 2005 Andreas Bierfert 0.41-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Dec 2005 09:21:24 -0000 1.6 +++ sources 3 Feb 2006 08:52:37 -0000 1.7 @@ -1 +1 @@ -62fd85dc7d38f7586073b469278ee58e libetpan-0.41.tar.gz +269c275151bbb9c3e818b58863cca670 libetpan-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 08:52:44 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 03:52:44 -0500 Subject: rpms/libetpan/devel .cvsignore, 1.6, 1.7 libetpan.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200602030853.k138rGZO002434@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2369/devel Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 Dec 2005 09:21:40 -0000 1.6 +++ .cvsignore 3 Feb 2006 08:52:44 -0000 1.7 @@ -1 +1 @@ -libetpan-0.41.tar.gz +libetpan-0.42.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libetpan.spec 25 Dec 2005 09:21:40 -0000 1.6 +++ libetpan.spec 3 Feb 2006 08:52:44 -0000 1.7 @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.41 +Version: 0.42 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -31,7 +31,7 @@ with %{name}. %prep -%setup -q -n %{name}-0.41 +%setup -q %build %configure --disable-static --with-gnutls=no @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.0.1 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Fri Feb 03 2006 Andreas Bierfert +0.42-1 +- version upgrade + * Sun Dec 25 2005 Andreas Bierfert 0.41-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Dec 2005 09:21:40 -0000 1.6 +++ sources 3 Feb 2006 08:52:44 -0000 1.7 @@ -1 +1 @@ -62fd85dc7d38f7586073b469278ee58e libetpan-0.41.tar.gz +269c275151bbb9c3e818b58863cca670 libetpan-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 09:04:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 04:04:09 -0500 Subject: rpms/sylpheed-claws/devel .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 sylpheed-claws.spec, 1.33, 1.34 Message-ID: <200602030904.k1394gPw004667@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4618/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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 18 Jan 2006 13:43:50 -0000 1.14 +++ .cvsignore 3 Feb 2006 09:04:09 -0000 1.15 @@ -1 +1 @@ -sylpheed-claws-2.0.0-rc4.tar.bz2 +sylpheed-claws-2.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 18 Jan 2006 13:43:50 -0000 1.15 +++ sources 3 Feb 2006 09:04:09 -0000 1.16 @@ -1 +1 @@ -a3efc6cedbd36cfd3f5f636f76cad61c sylpheed-claws-2.0.0-rc4.tar.bz2 +6e26f8e36772b71361d0c463b9a6c7a1 sylpheed-claws-2.0.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sylpheed-claws.spec 18 Jan 2006 13:43:50 -0000 1.33 +++ sylpheed-claws.spec 3 Feb 2006 09:04:09 -0000 1.34 @@ -1,13 +1,11 @@ -#%define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi ) - Name: sylpheed-claws Version: 2.0.0 -Release: 0.rc4%{?dist} -Summary: The bleeding edge branch of Sylpheed +Release: 1%{?dist} +Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc4.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.0.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -47,13 +45,9 @@ for development with %{name}. %prep -%setup -q -n %{name}-%{version}-rc4 +%setup -q %build -#%if %openssl_pc -#MY_OPENSSL_CFLAGS=`pkg-config openssl --cflags` -#%endif -#CFLAGS="${MY_OPENSSL_CFLAGS} ${RPM_OPT_FLAGS}" \ %configure --enable-openssl --enable-ipv6 \ --enable-ldap --enable-jpilot \ --enable-spamassassin-plugin \ @@ -113,6 +107,11 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Fri Feb 03 2006 Andreas Bierfert +2.0.0-1 +- version upgrade +- fix summary + * Wed Jan 18 2006 Andreas Bierfert 2.0.0-0.rc4 - version upgrade From fedora-extras-commits at redhat.com Fri Feb 3 09:03:59 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 04:03:59 -0500 Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 sylpheed-claws.spec, 1.25, 1.26 Message-ID: <200602030905.k139570Z004673@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-serv4618/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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 17 Nov 2005 09:56:55 -0000 1.11 +++ .cvsignore 3 Feb 2006 09:03:41 -0000 1.12 @@ -1 +1 @@ -sylpheed-claws-1.9.100.tar.bz2 +sylpheed-claws-2.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 17 Nov 2005 09:56:55 -0000 1.12 +++ sources 3 Feb 2006 09:03:41 -0000 1.13 @@ -1 +1 @@ -863c314557f90f17c2f6d6a0ab57e6c2 sylpheed-claws-1.9.100.tar.bz2 +6e26f8e36772b71361d0c463b9a6c7a1 sylpheed-claws-2.0.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sylpheed-claws.spec 21 Nov 2005 08:12:28 -0000 1.25 +++ sylpheed-claws.spec 3 Feb 2006 09:03:41 -0000 1.26 @@ -1,13 +1,13 @@ %define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi ) Name: sylpheed-claws -Version: 1.9.100 -Release: 2%{?dist} -Summary: The bleeding edge branch of Sylpheed +Version: 2.0.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-1.9.100.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.0.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -26,7 +26,7 @@ BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel -BuildRequires: libetpan-devel >= 0.40 +BuildRequires: libetpan-devel >= 0.41 Requires: spamassassin Requires: dillo @@ -113,6 +113,11 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Fri Feb 03 2006 Andreas Bierfert +2.0.0-1 +- version upgrade +- fix up summary + * Mon Nov 21 2005 Andreas Bierfert 1.9.100-2 - drop program suffix (causes sylpheed-claws-claws bin) From fedora-extras-commits at redhat.com Fri Feb 3 09:10:50 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Fri, 3 Feb 2006 04:10:50 -0500 Subject: rpms/libapreq2/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200602030911.k139BOQq005011@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4823 Modified Files: .cvsignore sources Log Message: Upload new sources file for the new libapreq2-2.07-rc4 tarball. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Dec 2005 20:32:12 -0000 1.5 +++ .cvsignore 3 Feb 2006 09:10:50 -0000 1.6 @@ -1 +1,2 @@ libapreq2-2.07-rc3.tar.gz +libapreq2-2.07-rc4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Dec 2005 20:32:12 -0000 1.5 +++ sources 3 Feb 2006 09:10:50 -0000 1.6 @@ -1 +1,2 @@ 3dcccf0afb7a5315e3d8115041893ee4 libapreq2-2.07-rc3.tar.gz +8fa0ef0e175f791fccd1681aa5eafc93 libapreq2-2.07-rc4.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 09:24:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 04:24:58 -0500 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.34,1.35 Message-ID: <200602030925.k139PFjr005119@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5102 Modified Files: sylpheed-claws.spec Log Message: - s/rc4// Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sylpheed-claws.spec 3 Feb 2006 09:04:09 -0000 1.34 +++ sylpheed-claws.spec 3 Feb 2006 09:24:57 -0000 1.35 @@ -76,7 +76,7 @@ %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -%{__install} %{_builddir}/%{name}-%{version}-rc4/sylpheed-claws.png \ +%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png %clean From fedora-extras-commits at redhat.com Fri Feb 3 09:38:42 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Fri, 3 Feb 2006 04:38:42 -0500 Subject: rpms/libapreq2/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200602030939.k139dEpK005289@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5270 Modified Files: .cvsignore sources Log Message: Use the correct option to replace sources. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2006 09:10:50 -0000 1.6 +++ .cvsignore 3 Feb 2006 09:38:41 -0000 1.7 @@ -1,2 +1 @@ -libapreq2-2.07-rc3.tar.gz libapreq2-2.07-rc4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2006 09:10:50 -0000 1.6 +++ sources 3 Feb 2006 09:38:41 -0000 1.7 @@ -1,2 +1 @@ -3dcccf0afb7a5315e3d8115041893ee4 libapreq2-2.07-rc3.tar.gz 8fa0ef0e175f791fccd1681aa5eafc93 libapreq2-2.07-rc4.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 09:45:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 3 Feb 2006 04:45:49 -0500 Subject: rpms/liboil/FC-3 .cvsignore, 1.4, 1.5 liboil.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200602030946.k139kMxd005439@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5376/FC-3 Modified Files: .cvsignore liboil.spec sources Log Message: Update to 0.3.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Feb 2006 19:18:22 -0000 1.4 +++ .cvsignore 3 Feb 2006 09:45:49 -0000 1.5 @@ -1 +1 @@ -liboil-0.3.6.tar.gz +liboil-0.3.7.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-3/liboil.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- liboil.spec 2 Feb 2006 19:19:51 -0000 1.4 +++ liboil.spec 3 Feb 2006 09:45:49 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.6 -Release: 2%{?dist} +Version: 0.3.7 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -77,8 +77,11 @@ %changelog -* Thu Feb 02 2006 Thomas Vander Stichele 0.3.6-2 -- update to 0.3.6 +* Fri Feb 3 2006 Matthias Saou 0.3.7-1 +- Update to 0.3.7. + +* Wed Dec 14 2005 Matthias Saou 0.3.6-1 +- Update to 0.3.6. * Mon Nov 14 2005 Matthias Saou 0.3.5-3 - Sync spec files across branches. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Feb 2006 19:18:22 -0000 1.4 +++ sources 3 Feb 2006 09:45:49 -0000 1.5 @@ -1 +1 @@ -a36b2d9cc71d75d814d7bdca2263290f liboil-0.3.6.tar.gz +1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 09:45:55 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 3 Feb 2006 04:45:55 -0500 Subject: rpms/liboil/FC-4 .cvsignore, 1.5, 1.6 liboil.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200602030946.k139kRP2005444@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5376/FC-4 Modified Files: .cvsignore liboil.spec sources Log Message: Update to 0.3.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Dec 2005 10:04:15 -0000 1.5 +++ .cvsignore 3 Feb 2006 09:45:55 -0000 1.6 @@ -1 +1 @@ -liboil-0.3.6.tar.gz +liboil-0.3.7.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/liboil.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- liboil.spec 15 Dec 2005 10:04:16 -0000 1.10 +++ liboil.spec 3 Feb 2006 09:45:55 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.6 +Version: 0.3.7 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -77,6 +77,9 @@ %changelog +* Fri Feb 3 2006 Matthias Saou 0.3.7-1 +- Update to 0.3.7. + * Wed Dec 14 2005 Matthias Saou 0.3.6-1 - Update to 0.3.6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Dec 2005 10:04:16 -0000 1.5 +++ sources 3 Feb 2006 09:45:55 -0000 1.6 @@ -1 +1 @@ -a36b2d9cc71d75d814d7bdca2263290f liboil-0.3.6.tar.gz +1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 09:46:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 3 Feb 2006 04:46:02 -0500 Subject: rpms/liboil/devel .cvsignore, 1.6, 1.7 liboil.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200602030946.k139kYcL005449@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5376/devel Modified Files: .cvsignore liboil.spec sources Log Message: Update to 0.3.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Dec 2005 16:17:17 -0000 1.6 +++ .cvsignore 3 Feb 2006 09:46:01 -0000 1.7 @@ -1 +1 @@ -liboil-0.3.6.tar.gz +liboil-0.3.7.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- liboil.spec 14 Dec 2005 16:17:17 -0000 1.12 +++ liboil.spec 3 Feb 2006 09:46:01 -0000 1.13 @@ -1,6 +1,6 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.6 +Version: 0.3.7 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -77,6 +77,9 @@ %changelog +* Fri Feb 3 2006 Matthias Saou 0.3.7-1 +- Update to 0.3.7. + * Wed Dec 14 2005 Matthias Saou 0.3.6-1 - Update to 0.3.6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Dec 2005 16:17:17 -0000 1.6 +++ sources 3 Feb 2006 09:46:01 -0000 1.7 @@ -1 +1 @@ -a36b2d9cc71d75d814d7bdca2263290f liboil-0.3.6.tar.gz +1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 09:51:34 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 04:51:34 -0500 Subject: rpms/sylpheed-claws-plugins/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sylpheed-claws-plugins.spec, 1.5, 1.6 Message-ID: <200602030952.k139q6ws005542@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5504/FC-4 Modified Files: .cvsignore sources sylpheed-claws-plugins.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Nov 2005 22:11:17 -0000 1.3 +++ .cvsignore 3 Feb 2006 09:51:34 -0000 1.4 @@ -1 +1 @@ -sylpheed-claws-external-plugins-1.9.100.tar.bz2 +sylpheed-claws-extra-plugins-2.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Nov 2005 22:11:17 -0000 1.3 +++ sources 3 Feb 2006 09:51:34 -0000 1.4 @@ -1 +1 @@ -0a9cdd9f0fe60e7d858f3a4c8e19c34c sylpheed-claws-external-plugins-1.9.100.tar.bz2 +77fe8e71f12c6f6ae1dfe9d55ab3d7d4 sylpheed-claws-extra-plugins-2.0.0.tar.bz2 Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sylpheed-claws-plugins.spec 25 Dec 2005 09:29:10 -0000 1.5 +++ sylpheed-claws-plugins.spec 3 Feb 2006 09:51:34 -0000 1.6 @@ -1,12 +1,12 @@ Name: sylpheed-claws-plugins -Version: 1.9.100 -Release: 2%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-external-plugins-%{version}.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sylpheed-claws-devel >= %{version} @@ -17,12 +17,14 @@ BuildRequires: synce-devel Requires: %{name}-acpi-notifier = %{version}-%{release} +Requires: %{name}-att-remover = %{version}-%{release} Requires: %{name}-cachesaver = %{version}-%{release} Requires: %{name}-etpan-privacy = %{version}-%{release} Requires: %{name}-fetchinfo = %{version}-%{release} Requires: %{name}-maildir = %{version}-%{release} Requires: %{name}-mailmbox = %{version}-%{release} Requires: %{name}-perl = %{version}-%{release} +Requires: %{name}-rssyl = %{version}-%{release} Requires: %{name}-synce = %{version}-%{release} Requires: %{name}-vcalendar = %{version}-%{release} @@ -37,6 +39,15 @@ %description acpi-notifier %{summary} +%package att-remover +Summary: Attachments remover plugin for sylpheed-claws +Group: Applications/Internet +Requires: sylpheed-claws >= %{version} + +%description att-remover +%{summary} + + %package cachesaver Summary: A cache saving plugin Group: Applications/Internet @@ -93,6 +104,14 @@ This plugin provides an extended filtering engine for the email client sylpheed-claws. It allows for the use of full perl power in email filters. +%package rssyl +Summary: RSS plugin for sylpheed-claws +Group: Applications/Internet +Requires: sylpheed-claws >= %{version} + +%description rssyl +%{summary} + %package synce Summary: Keeping the addressbook of a Windows CE device in sync Group: Applications/Internet @@ -113,52 +132,62 @@ Evolution or Outlook. %prep -%setup -q -n sylpheed-claws-external-plugins-%{version} +%setup -q -n sylpheed-claws-extra-plugins-%{version} %build #acpi_notifier -cd acpi_notifier-0.3 +cd acpi_notifier-0.8 +%configure --disable-static --disable-dependency-tracking +%{__make} %{?_smp_mflags} + +#att_remover +cd ../att_remover-0.4 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} # cachesaver -cd ../cachesaver-0.5 +cd ../cachesaver-0.7 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #etpan-privacy -cd ../etpan-privacy-0.9 +cd ../etpan-privacy-0.13 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.6 +cd ../fetchinfo-plugin-0.4.10 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #maildir -cd ../maildir-0.11 +cd ../maildir-0.19 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #mailmbox -cd ../mailmbox-1.4 +cd ../mailmbox-1.10 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #perl -cd ../perl_plugin-0.4 +cd ../perl_plugin-0.6 +%configure --disable-static --disable-dependency-tracking +%{__make} %{?_smp_mflags} + +#rssyl +cd ../rssyl-0.4pre %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #synce -cd ../synce_plugin-0.2 +cd ../synce_plugin-0.4 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #vcalendar -cd ../vcalendar-1.8 +cd ../vcalendar-1.29 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} @@ -166,39 +195,47 @@ rm -rf $RPM_BUILD_ROOT # acpi_notifier -cd acpi_notifier-0.3 +cd acpi_notifier-0.8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT + +# att_remover +cd ../att_remover-0.4 %{__make} install DESTDIR=$RPM_BUILD_ROOT # cachesaver -cd ../cachesaver-0.5 +cd ../cachesaver-0.7 %{__make} install DESTDIR=$RPM_BUILD_ROOT #etpan-privacy -cd ../etpan-privacy-0.9 +cd ../etpan-privacy-0.13 %{__make} install DESTDIR=$RPM_BUILD_ROOT #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.6 +cd ../fetchinfo-plugin-0.4.10 %{__make} install DESTDIR=$RPM_BUILD_ROOT #maildir -cd ../maildir-0.11 +cd ../maildir-0.19 %{__make} install DESTDIR=$RPM_BUILD_ROOT #mailmbox -cd ../mailmbox-1.4 +cd ../mailmbox-1.10 %{__make} install DESTDIR=$RPM_BUILD_ROOT #perl -cd ../perl_plugin-0.4 +cd ../perl_plugin-0.6 +%{__make} install DESTDIR=$RPM_BUILD_ROOT + +#rssyl +cd ../rssyl-0.4pre %{__make} install DESTDIR=$RPM_BUILD_ROOT #synce -cd ../synce_plugin-0.2 +cd ../synce_plugin-0.4 %{__make} install DESTDIR=$RPM_BUILD_ROOT #vcalendar -cd ../vcalendar-1.8 +cd ../vcalendar-1.29 %{__make} install DESTDIR=$RPM_BUILD_ROOT find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -212,79 +249,129 @@ %files acpi-notifier %defattr(-,root,root,-) -%doc acpi_notifier-0.3/ChangeLog -%doc acpi_notifier-0.3/COPYING -%doc acpi_notifier-0.3/NEWS -%doc acpi_notifier-0.3/AUTHORS -%doc acpi_notifier-0.3/README +%doc acpi_notifier-0.8/ChangeLog +%doc acpi_notifier-0.8/COPYING +%doc acpi_notifier-0.8/NEWS +%doc acpi_notifier-0.8/AUTHORS +%doc acpi_notifier-0.8/README %{_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 +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/acpi_notifier.mo +%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/acpi_notifier.mo +%lang(it) %{_datadir}/locale/it/LC_MESSAGES/acpi_notifier.mo +%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/acpi_notifier.mo +%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/acpi_notifier.mo +%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/acpi_notifier.mo +%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/acpi_notifier.mo +%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/acpi_notifier.mo + +%files att-remover +%defattr(-,root,root,-) +%doc att_remover-0.4/AUTHORS +%doc att_remover-0.4/ChangeLog +%doc att_remover-0.4/COPYING +%doc att_remover-0.4/NEWS +%doc att_remover-0.4/README +%{_libdir}/sylpheed-claws/plugins/att_remover* %files cachesaver %defattr(-,root,root,-) -%doc cachesaver-0.5/AUTHORS -%doc cachesaver-0.5/ChangeLog -%doc cachesaver-0.5/COPYING +%doc cachesaver-0.7/AUTHORS +%doc cachesaver-0.7/ChangeLog +%doc cachesaver-0.7/COPYING %{_libdir}/sylpheed-claws/plugins/cachesaver* %files etpan-privacy %defattr(-,root,root,-) -%doc etpan-privacy-0.9/AUTHORS -%doc etpan-privacy-0.9/ChangeLog -%doc etpan-privacy-0.9/COPYING -%doc etpan-privacy-0.9/README +%doc etpan-privacy-0.13/AUTHORS +%doc etpan-privacy-0.13/ChangeLog +%doc etpan-privacy-0.13/COPYING +%doc etpan-privacy-0.13/README %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so %files fetchinfo %defattr(-,root,root,-) -%doc fetchinfo-plugin-0.4.6/ChangeLog -%doc fetchinfo-plugin-0.4.6/COPYING -%doc fetchinfo-plugin-0.4.6/README +%doc fetchinfo-plugin-0.4.10/ChangeLog +%doc fetchinfo-plugin-0.4.10/COPYING +%doc fetchinfo-plugin-0.4.10/README %{_libdir}/sylpheed-claws/plugins/fetchinfo* %files maildir %defattr(-,root,root,-) -%doc maildir-0.11/AUTHORS -%doc maildir-0.11/ChangeLog -%doc maildir-0.11/COPYING -%doc maildir-0.11/README -%doc maildir-0.11/doc/README.xml +%doc maildir-0.19/AUTHORS +%doc maildir-0.19/ChangeLog +%doc maildir-0.19/COPYING +%doc maildir-0.19/README +%doc maildir-0.19/doc/README.xml %{_libdir}/sylpheed-claws/plugins/maildir* %files mailmbox %defattr(-,root,root,-) -%doc mailmbox-1.4/AUTHORS -%doc mailmbox-1.4/ChangeLog -%doc mailmbox-1.4/COPYING -%doc mailmbox-1.4/README +%doc mailmbox-1.10/AUTHORS +%doc mailmbox-1.10/ChangeLog +%doc mailmbox-1.10/COPYING +%doc mailmbox-1.10/README %{_libdir}/sylpheed-claws/plugins/mailmbox* %files perl %defattr(-,root,root,-) -%doc perl_plugin-0.4/AUTHORS -%doc perl_plugin-0.4/ChangeLog -%doc perl_plugin-0.4/COPYING -%doc perl_plugin-0.4/README -%doc perl_plugin-0.4/sc_perl.pod +%doc perl_plugin-0.6/AUTHORS +%doc perl_plugin-0.6/ChangeLog +%doc perl_plugin-0.6/COPYING +%doc perl_plugin-0.6/README +%doc perl_plugin-0.6/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so +%files rssyl +%defattr(-,root,root,-) +%doc rssyl-0.4pre/AUTHORS +%doc rssyl-0.4pre/ChangeLog +%doc rssyl-0.4pre/COPYING +%doc rssyl-0.4pre/TODO +%{_libdir}/sylpheed-claws/plugins/rssyl* +%lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/rssyl.mo +%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(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 +%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo + %files synce %defattr(-,root,root,-) -%doc synce_plugin-0.2/AUTHORS -%doc synce_plugin-0.2/ChangeLog -%doc synce_plugin-0.2/COPYING -%doc synce_plugin-0.2/README +%doc synce_plugin-0.4/AUTHORS +%doc synce_plugin-0.4/ChangeLog +%doc synce_plugin-0.4/COPYING +%doc synce_plugin-0.4/README %{_libdir}/sylpheed-claws/plugins/synce* %files vcalendar %defattr(-,root,root,-) -%doc vcalendar-1.8/AUTHORS -%doc vcalendar-1.8/ChangeLog -%doc vcalendar-1.8/COPYING -%doc vcalendar-1.8/README +%doc vcalendar-1.29/AUTHORS +%doc vcalendar-1.29/ChangeLog +%doc vcalendar-1.29/COPYING +%doc vcalendar-1.29/README %{_libdir}/sylpheed-claws/plugins/vcalendar.so +%lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo +%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(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 +* Fri Feb 03 2006 Andreas Bierfert +2.0.0-1 +- version upgrade + * Sun Dec 25 2005 Andreas Bierfert 1.9.100-2 - rebuild From fedora-extras-commits at redhat.com Fri Feb 3 09:51:40 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 04:51:40 -0500 Subject: rpms/sylpheed-claws-plugins/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sylpheed-claws-plugins.spec, 1.5, 1.6 Message-ID: <200602030952.k139qCID005550@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-serv5504/devel Modified Files: .cvsignore sources sylpheed-claws-plugins.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Nov 2005 22:11:22 -0000 1.3 +++ .cvsignore 3 Feb 2006 09:51:40 -0000 1.4 @@ -1 +1 @@ -sylpheed-claws-external-plugins-1.9.100.tar.bz2 +sylpheed-claws-extra-plugins-2.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Nov 2005 22:11:22 -0000 1.3 +++ sources 3 Feb 2006 09:51:40 -0000 1.4 @@ -1 +1 @@ -0a9cdd9f0fe60e7d858f3a4c8e19c34c sylpheed-claws-external-plugins-1.9.100.tar.bz2 +77fe8e71f12c6f6ae1dfe9d55ab3d7d4 sylpheed-claws-extra-plugins-2.0.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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sylpheed-claws-plugins.spec 25 Dec 2005 09:29:16 -0000 1.5 +++ sylpheed-claws-plugins.spec 3 Feb 2006 09:51:40 -0000 1.6 @@ -1,12 +1,12 @@ Name: sylpheed-claws-plugins -Version: 1.9.100 -Release: 2%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-external-plugins-%{version}.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sylpheed-claws-devel >= %{version} @@ -17,12 +17,14 @@ BuildRequires: synce-devel Requires: %{name}-acpi-notifier = %{version}-%{release} +Requires: %{name}-att-remover = %{version}-%{release} Requires: %{name}-cachesaver = %{version}-%{release} Requires: %{name}-etpan-privacy = %{version}-%{release} Requires: %{name}-fetchinfo = %{version}-%{release} Requires: %{name}-maildir = %{version}-%{release} Requires: %{name}-mailmbox = %{version}-%{release} Requires: %{name}-perl = %{version}-%{release} +Requires: %{name}-rssyl = %{version}-%{release} Requires: %{name}-synce = %{version}-%{release} Requires: %{name}-vcalendar = %{version}-%{release} @@ -37,6 +39,15 @@ %description acpi-notifier %{summary} +%package att-remover +Summary: Attachments remover plugin for sylpheed-claws +Group: Applications/Internet +Requires: sylpheed-claws >= %{version} + +%description att-remover +%{summary} + + %package cachesaver Summary: A cache saving plugin Group: Applications/Internet @@ -93,6 +104,14 @@ This plugin provides an extended filtering engine for the email client sylpheed-claws. It allows for the use of full perl power in email filters. +%package rssyl +Summary: RSS plugin for sylpheed-claws +Group: Applications/Internet +Requires: sylpheed-claws >= %{version} + +%description rssyl +%{summary} + %package synce Summary: Keeping the addressbook of a Windows CE device in sync Group: Applications/Internet @@ -113,52 +132,62 @@ Evolution or Outlook. %prep -%setup -q -n sylpheed-claws-external-plugins-%{version} +%setup -q -n sylpheed-claws-extra-plugins-%{version} %build #acpi_notifier -cd acpi_notifier-0.3 +cd acpi_notifier-0.8 +%configure --disable-static --disable-dependency-tracking +%{__make} %{?_smp_mflags} + +#att_remover +cd ../att_remover-0.4 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} # cachesaver -cd ../cachesaver-0.5 +cd ../cachesaver-0.7 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #etpan-privacy -cd ../etpan-privacy-0.9 +cd ../etpan-privacy-0.13 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.6 +cd ../fetchinfo-plugin-0.4.10 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #maildir -cd ../maildir-0.11 +cd ../maildir-0.19 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #mailmbox -cd ../mailmbox-1.4 +cd ../mailmbox-1.10 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #perl -cd ../perl_plugin-0.4 +cd ../perl_plugin-0.6 +%configure --disable-static --disable-dependency-tracking +%{__make} %{?_smp_mflags} + +#rssyl +cd ../rssyl-0.4pre %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #synce -cd ../synce_plugin-0.2 +cd ../synce_plugin-0.4 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #vcalendar -cd ../vcalendar-1.8 +cd ../vcalendar-1.29 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} @@ -166,39 +195,47 @@ rm -rf $RPM_BUILD_ROOT # acpi_notifier -cd acpi_notifier-0.3 +cd acpi_notifier-0.8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT + +# att_remover +cd ../att_remover-0.4 %{__make} install DESTDIR=$RPM_BUILD_ROOT # cachesaver -cd ../cachesaver-0.5 +cd ../cachesaver-0.7 %{__make} install DESTDIR=$RPM_BUILD_ROOT #etpan-privacy -cd ../etpan-privacy-0.9 +cd ../etpan-privacy-0.13 %{__make} install DESTDIR=$RPM_BUILD_ROOT #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.6 +cd ../fetchinfo-plugin-0.4.10 %{__make} install DESTDIR=$RPM_BUILD_ROOT #maildir -cd ../maildir-0.11 +cd ../maildir-0.19 %{__make} install DESTDIR=$RPM_BUILD_ROOT #mailmbox -cd ../mailmbox-1.4 +cd ../mailmbox-1.10 %{__make} install DESTDIR=$RPM_BUILD_ROOT #perl -cd ../perl_plugin-0.4 +cd ../perl_plugin-0.6 +%{__make} install DESTDIR=$RPM_BUILD_ROOT + +#rssyl +cd ../rssyl-0.4pre %{__make} install DESTDIR=$RPM_BUILD_ROOT #synce -cd ../synce_plugin-0.2 +cd ../synce_plugin-0.4 %{__make} install DESTDIR=$RPM_BUILD_ROOT #vcalendar -cd ../vcalendar-1.8 +cd ../vcalendar-1.29 %{__make} install DESTDIR=$RPM_BUILD_ROOT find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -212,79 +249,129 @@ %files acpi-notifier %defattr(-,root,root,-) -%doc acpi_notifier-0.3/ChangeLog -%doc acpi_notifier-0.3/COPYING -%doc acpi_notifier-0.3/NEWS -%doc acpi_notifier-0.3/AUTHORS -%doc acpi_notifier-0.3/README +%doc acpi_notifier-0.8/ChangeLog +%doc acpi_notifier-0.8/COPYING +%doc acpi_notifier-0.8/NEWS +%doc acpi_notifier-0.8/AUTHORS +%doc acpi_notifier-0.8/README %{_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 +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/acpi_notifier.mo +%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/acpi_notifier.mo +%lang(it) %{_datadir}/locale/it/LC_MESSAGES/acpi_notifier.mo +%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/acpi_notifier.mo +%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/acpi_notifier.mo +%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/acpi_notifier.mo +%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/acpi_notifier.mo +%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/acpi_notifier.mo + +%files att-remover +%defattr(-,root,root,-) +%doc att_remover-0.4/AUTHORS +%doc att_remover-0.4/ChangeLog +%doc att_remover-0.4/COPYING +%doc att_remover-0.4/NEWS +%doc att_remover-0.4/README +%{_libdir}/sylpheed-claws/plugins/att_remover* %files cachesaver %defattr(-,root,root,-) -%doc cachesaver-0.5/AUTHORS -%doc cachesaver-0.5/ChangeLog -%doc cachesaver-0.5/COPYING +%doc cachesaver-0.7/AUTHORS +%doc cachesaver-0.7/ChangeLog +%doc cachesaver-0.7/COPYING %{_libdir}/sylpheed-claws/plugins/cachesaver* %files etpan-privacy %defattr(-,root,root,-) -%doc etpan-privacy-0.9/AUTHORS -%doc etpan-privacy-0.9/ChangeLog -%doc etpan-privacy-0.9/COPYING -%doc etpan-privacy-0.9/README +%doc etpan-privacy-0.13/AUTHORS +%doc etpan-privacy-0.13/ChangeLog +%doc etpan-privacy-0.13/COPYING +%doc etpan-privacy-0.13/README %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so %files fetchinfo %defattr(-,root,root,-) -%doc fetchinfo-plugin-0.4.6/ChangeLog -%doc fetchinfo-plugin-0.4.6/COPYING -%doc fetchinfo-plugin-0.4.6/README +%doc fetchinfo-plugin-0.4.10/ChangeLog +%doc fetchinfo-plugin-0.4.10/COPYING +%doc fetchinfo-plugin-0.4.10/README %{_libdir}/sylpheed-claws/plugins/fetchinfo* %files maildir %defattr(-,root,root,-) -%doc maildir-0.11/AUTHORS -%doc maildir-0.11/ChangeLog -%doc maildir-0.11/COPYING -%doc maildir-0.11/README -%doc maildir-0.11/doc/README.xml +%doc maildir-0.19/AUTHORS +%doc maildir-0.19/ChangeLog +%doc maildir-0.19/COPYING +%doc maildir-0.19/README +%doc maildir-0.19/doc/README.xml %{_libdir}/sylpheed-claws/plugins/maildir* %files mailmbox %defattr(-,root,root,-) -%doc mailmbox-1.4/AUTHORS -%doc mailmbox-1.4/ChangeLog -%doc mailmbox-1.4/COPYING -%doc mailmbox-1.4/README +%doc mailmbox-1.10/AUTHORS +%doc mailmbox-1.10/ChangeLog +%doc mailmbox-1.10/COPYING +%doc mailmbox-1.10/README %{_libdir}/sylpheed-claws/plugins/mailmbox* %files perl %defattr(-,root,root,-) -%doc perl_plugin-0.4/AUTHORS -%doc perl_plugin-0.4/ChangeLog -%doc perl_plugin-0.4/COPYING -%doc perl_plugin-0.4/README -%doc perl_plugin-0.4/sc_perl.pod +%doc perl_plugin-0.6/AUTHORS +%doc perl_plugin-0.6/ChangeLog +%doc perl_plugin-0.6/COPYING +%doc perl_plugin-0.6/README +%doc perl_plugin-0.6/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so +%files rssyl +%defattr(-,root,root,-) +%doc rssyl-0.4pre/AUTHORS +%doc rssyl-0.4pre/ChangeLog +%doc rssyl-0.4pre/COPYING +%doc rssyl-0.4pre/TODO +%{_libdir}/sylpheed-claws/plugins/rssyl* +%lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/rssyl.mo +%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(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 +%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo + %files synce %defattr(-,root,root,-) -%doc synce_plugin-0.2/AUTHORS -%doc synce_plugin-0.2/ChangeLog -%doc synce_plugin-0.2/COPYING -%doc synce_plugin-0.2/README +%doc synce_plugin-0.4/AUTHORS +%doc synce_plugin-0.4/ChangeLog +%doc synce_plugin-0.4/COPYING +%doc synce_plugin-0.4/README %{_libdir}/sylpheed-claws/plugins/synce* %files vcalendar %defattr(-,root,root,-) -%doc vcalendar-1.8/AUTHORS -%doc vcalendar-1.8/ChangeLog -%doc vcalendar-1.8/COPYING -%doc vcalendar-1.8/README +%doc vcalendar-1.29/AUTHORS +%doc vcalendar-1.29/ChangeLog +%doc vcalendar-1.29/COPYING +%doc vcalendar-1.29/README %{_libdir}/sylpheed-claws/plugins/vcalendar.so +%lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo +%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(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 +* Fri Feb 03 2006 Andreas Bierfert +2.0.0-1 +- version upgrade + * Sun Dec 25 2005 Andreas Bierfert 1.9.100-2 - rebuild From fedora-extras-commits at redhat.com Fri Feb 3 10:04:54 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Fri, 3 Feb 2006 05:04:54 -0500 Subject: rpms/libapreq2/devel libapreq2.spec,1.7,1.8 Message-ID: <200602031005.k13A5aYH007459@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7442 Modified Files: libapreq2.spec Log Message: Re-tag for rebuild. Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libapreq2.spec 3 Feb 2006 03:48:26 -0000 1.7 +++ libapreq2.spec 3 Feb 2006 10:04:54 -0000 1.8 @@ -2,7 +2,7 @@ Name: libapreq2 Version: 2.07 -Release: 0.1.rc4%{?dist} +Release: 0.2.rc4%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries @@ -153,6 +153,9 @@ %changelog +* 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 - bump up to 2.07-rc4 From fedora-extras-commits at redhat.com Fri Feb 3 10:09:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 05:09:08 -0500 Subject: rpms/koffice/devel koffice.spec,1.24,1.25 Message-ID: <200602031009.k13A9eKj007533@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7508 Modified Files: koffice.spec Log Message: - disable kross ruby support for now... #179835 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- koffice.spec 2 Feb 2006 16:41:15 -0000 1.24 +++ koffice.spec 3 Feb 2006 10:09:07 -0000 1.25 @@ -55,11 +55,12 @@ BuildRequires: libxslt-devel # new with 1.4.90 BuildRequires: OpenEXR-devel -BuildRequires: ruby ruby-devel BuildRequires: libexif-devel BuildRequires: libGL-devel libGLU-devel BuildRequires: libXi-devel BuildRequires: readline-devel +# build without kcross ruby support till I get feedback for #179835 +#BuildRequires: ruby ruby-devel %description KOffice - Integrated Office Suite @@ -782,7 +783,7 @@ %{_libdir}/kde3/krosskexidb.* %{_libdir}/kde3/krosskritacore.* %{_libdir}/kde3/krosspython.* -%{_libdir}/kde3/krossruby.* +#%{_libdir}/kde3/krossruby.* %{_libdir}/libkrossapi.* %{_libdir}/libkrossmain.* %{_datadir}/config/kexirc From fedora-extras-commits at redhat.com Fri Feb 3 10:11:37 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 05:11:37 -0500 Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.6, 1.7 Message-ID: <200602031012.k13ACAEA007634@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-serv7572/devel Modified Files: sylpheed-claws-plugins.spec Log Message: - add BR curl-devel Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sylpheed-claws-plugins.spec 3 Feb 2006 09:51:40 -0000 1.6 +++ sylpheed-claws-plugins.spec 3 Feb 2006 10:11:35 -0000 1.7 @@ -15,6 +15,7 @@ BuildRequires: libetpan-devel BuildRequires: perl BuildRequires: synce-devel +BuildRequires: curl-devel Requires: %{name}-acpi-notifier = %{version}-%{release} Requires: %{name}-att-remover = %{version}-%{release} From fedora-extras-commits at redhat.com Fri Feb 3 10:11:17 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 05:11:17 -0500 Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.6, 1.7 Message-ID: <200602031012.k13ACP5E007637@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7572/FC-4 Modified Files: sylpheed-claws-plugins.spec Log Message: - add BR curl-devel Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sylpheed-claws-plugins.spec 3 Feb 2006 09:51:34 -0000 1.6 +++ sylpheed-claws-plugins.spec 3 Feb 2006 10:11:17 -0000 1.7 @@ -15,6 +15,7 @@ BuildRequires: libetpan-devel BuildRequires: perl BuildRequires: synce-devel +BuildRequires: curl-devel Requires: %{name}-acpi-notifier = %{version}-%{release} Requires: %{name}-att-remover = %{version}-%{release} From fedora-extras-commits at redhat.com Fri Feb 3 10:23:27 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 3 Feb 2006 05:23:27 -0500 Subject: rpms/php-mmcache/devel .cvsignore, 1.2, NONE Makefile, 1.2, NONE php-mmcache.spec, 1.8, NONE sources, 1.2, NONE Message-ID: <200602031023.k13ANTB3007810@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-mmcache/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7798/devel Removed Files: .cvsignore Makefile php-mmcache.spec sources Log Message: Remove devel branch, as the project is dead and incompatible with recent PHP versions. --- .cvsignore DELETED --- --- Makefile DELETED --- --- php-mmcache.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 11:24:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 06:24:50 -0500 Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.7, 1.8 Message-ID: <200602031125.k13BPMBI009787@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9754/FC-4 Modified Files: sylpheed-claws-plugins.spec Log Message: - add BR libxml2-devel Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sylpheed-claws-plugins.spec 3 Feb 2006 10:11:17 -0000 1.7 +++ sylpheed-claws-plugins.spec 3 Feb 2006 11:24:50 -0000 1.8 @@ -16,6 +16,7 @@ BuildRequires: perl BuildRequires: synce-devel BuildRequires: curl-devel +BuildRequires: libxml2-devel Requires: %{name}-acpi-notifier = %{version}-%{release} Requires: %{name}-att-remover = %{version}-%{release} From fedora-extras-commits at redhat.com Fri Feb 3 11:24:56 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 06:24:56 -0500 Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.7, 1.8 Message-ID: <200602031125.k13BPSvc009790@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-serv9754/devel Modified Files: sylpheed-claws-plugins.spec Log Message: - add BR libxml2-devel Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sylpheed-claws-plugins.spec 3 Feb 2006 10:11:35 -0000 1.7 +++ sylpheed-claws-plugins.spec 3 Feb 2006 11:24:56 -0000 1.8 @@ -16,6 +16,7 @@ BuildRequires: perl BuildRequires: synce-devel BuildRequires: curl-devel +BuildRequires: libxml2-devel Requires: %{name}-acpi-notifier = %{version}-%{release} Requires: %{name}-att-remover = %{version}-%{release} From fedora-extras-commits at redhat.com Fri Feb 3 13:01:44 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 08:01:44 -0500 Subject: rpms/koffice/devel koffice.spec,1.25,1.26 Message-ID: <200602031302.k13D2HMf013685@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13650 Modified Files: koffice.spec Log Message: - fixed -suite Req Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- koffice.spec 3 Feb 2006 10:09:07 -0000 1.25 +++ koffice.spec 3 Feb 2006 13:01:43 -0000 1.26 @@ -83,7 +83,7 @@ Requires: koffice-kchart Requires: koffice-kformula Requires: koffice-filters -Requires: koffice-plato +Requires: koffice-kplato %description suite KOffice - Integrated Office Suite From fedora-extras-commits at redhat.com Fri Feb 3 15:52:06 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 3 Feb 2006 10:52:06 -0500 Subject: rpms/python-cheetah - New directory Message-ID: <200602031552.k13Fq8JQ018359@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/extras/rpms/python-cheetah In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18351/python-cheetah Log Message: Directory /cvs/extras/rpms/python-cheetah added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 15:52:12 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 3 Feb 2006 10:52:12 -0500 Subject: rpms/python-cheetah/devel - New directory Message-ID: <200602031552.k13FqE3W018374@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/extras/rpms/python-cheetah/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18351/python-cheetah/devel Log Message: Directory /cvs/extras/rpms/python-cheetah/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 15:53:19 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 3 Feb 2006 10:53:19 -0500 Subject: rpms/python-cheetah Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602031553.k13FrLkR018432@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/extras/rpms/python-cheetah In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18420 Added Files: Makefile import.log Log Message: Setup of module python-cheetah --- NEW FILE Makefile --- # Top level Makefile for module python-cheetah all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 3 15:53:25 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 3 Feb 2006 10:53:25 -0500 Subject: rpms/python-cheetah/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602031553.k13FrRlZ018452@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/extras/rpms/python-cheetah/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18420/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-cheetah --- NEW 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 Feb 3 15:53:51 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 3 Feb 2006 10:53:51 -0500 Subject: rpms/python-cheetah import.log,1.1,1.2 Message-ID: <200602031554.k13FsNMx018520@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/extras/rpms/python-cheetah In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486 Modified Files: import.log Log Message: auto-import python-cheetah-1.0-1 on branch devel from python-cheetah-1.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-cheetah/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Feb 2006 15:53:19 -0000 1.1 +++ import.log 3 Feb 2006 15:53:51 -0000 1.2 @@ -0,0 +1 @@ +python-cheetah-1_0-1:HEAD:python-cheetah-1.0-1.src.rpm:1138982027 From fedora-extras-commits at redhat.com Fri Feb 3 15:53:57 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 3 Feb 2006 10:53:57 -0500 Subject: rpms/python-cheetah/devel python-cheetah.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602031554.k13FsTMD018525@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/extras/rpms/python-cheetah/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486/devel Modified Files: .cvsignore sources Added Files: python-cheetah.spec Log Message: auto-import python-cheetah-1.0-1 on branch devel from python-cheetah-1.0-1.src.rpm --- NEW FILE python-cheetah.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)")} Name: python-cheetah Version: 1.0 Release: 1%{?dist} Summary: Template engine and code-generator Group: Development/Libraries License: MIT URL: http://sourceforge.net/projects/cheetahtemplate Source0: http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description Cheetah is a Python-powered template engine and code-generator. It is similar to the Jakarta project's Velocity. %prep %setup -q -n Cheetah-%{version} %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES LICENSE README TODO %{_bindir}/cheetah %{_bindir}/cheetah-compile %dir %{python_sitelib}/Cheetah %{python_sitelib}/Cheetah/*.py %{python_sitelib}/Cheetah/*.pyc %{python_sitelib}/Cheetah/_namemapper.so %ghost %{python_sitelib}/Cheetah/*.pyo %dir %{python_sitelib}/Cheetah/Templates %{python_sitelib}/Cheetah/Templates/*.py %{python_sitelib}/Cheetah/Templates/*.pyc %{python_sitelib}/Cheetah/Templates/*.tmpl %ghost %{python_sitelib}/Cheetah/Templates/*.pyo %dir %{python_sitelib}/Cheetah/Tests %{python_sitelib}/Cheetah/Tests/*.py %{python_sitelib}/Cheetah/Tests/*.pyc %ghost %{python_sitelib}/Cheetah/Tests/*.pyo %dir %{python_sitelib}/Cheetah/Tools %{python_sitelib}/Cheetah/Tools/*.py %{python_sitelib}/Cheetah/Tools/*.pyc %{python_sitelib}/Cheetah/Tools/*.txt %ghost %{python_sitelib}/Cheetah/Tools/*.pyo %dir %{python_sitelib}/Cheetah/Utils %{python_sitelib}/Cheetah/Utils/*.py %{python_sitelib}/Cheetah/Utils/*.pyc %ghost %{python_sitelib}/Cheetah/Utils/*.pyo %dir %{python_sitelib}/Cheetah/Utils/optik %{python_sitelib}/Cheetah/Utils/optik/*.py %{python_sitelib}/Cheetah/Utils/optik/*.pyc %ghost %{python_sitelib}/Cheetah/Utils/optik/*.pyo %changelog * Wed Dec 7 2005 Mike Bonnet - 1.0-1 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cheetah/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Feb 2006 15:53:25 -0000 1.1 +++ .cvsignore 3 Feb 2006 15:53:56 -0000 1.2 @@ -0,0 +1 @@ +Cheetah-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cheetah/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Feb 2006 15:53:25 -0000 1.1 +++ sources 3 Feb 2006 15:53:56 -0000 1.2 @@ -0,0 +1 @@ +aaa4907b8877093b9bb11e6cea6b029b Cheetah-1.0.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 16:01:23 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 3 Feb 2006 11:01:23 -0500 Subject: owners owners.list,1.601,1.602 Message-ID: <200602031601.k13G1uOB020343@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19414 Modified Files: owners.list Log Message: added python-cheetah to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.601 retrieving revision 1.602 diff -u -r1.601 -r1.602 --- owners.list 3 Feb 2006 06:58:48 -0000 1.601 +++ owners.list 3 Feb 2006 16:01:23 -0000 1.602 @@ -1050,6 +1050,7 @@ Fedora Extras|python-basemap|Plots data on map projections (with continental and political boundaries)|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|python-basemap-data|Data for python-basemap|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|python-bibtex|Python extension to parse BibTeX files|z.kota at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|python-cheetah|Template engine and code-generator|mikeb at redhat.com|extras-qa at fedoraproject.org| 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-clientform|Python module for client-side HTML forms|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Feb 3 17:07:07 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 3 Feb 2006 12:07:07 -0500 Subject: rpms/ncarg - New directory Message-ID: <200602031707.k13H7EhO022616@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22606/ncarg Log Message: Directory /cvs/extras/rpms/ncarg added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 17:07:16 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 3 Feb 2006 12:07:16 -0500 Subject: rpms/ncarg/devel - New directory Message-ID: <200602031707.k13H7IJs022634@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22606/ncarg/devel Log Message: Directory /cvs/extras/rpms/ncarg/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 17:07:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 3 Feb 2006 12:07:18 -0500 Subject: rpms/perl-Test-Pod/devel .cvsignore, 1.2, 1.3 perl-Test-Pod.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200602031707.k13H7p6N022675@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Pod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22630 Modified Files: .cvsignore perl-Test-Pod.spec sources Log Message: Update to 1.24. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:09:05 -0000 1.2 +++ .cvsignore 3 Feb 2006 17:07:18 -0000 1.3 @@ -1 +1 @@ -Test-Pod-1.20.tar.gz +Test-Pod-1.24.tar.gz Index: perl-Test-Pod.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod/devel/perl-Test-Pod.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Test-Pod.spec 12 May 2005 15:07:50 -0000 1.7 +++ perl-Test-Pod.spec 3 Feb 2006 17:07:18 -0000 1.8 @@ -1,18 +1,19 @@ Name: perl-Test-Pod -Version: 1.20 -Release: 3%{?dist} +Version: 1.24 +Release: 1%{?dist} Summary: Perl module for checking for POD errors in files Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Pod/ -Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-1.20.tar.gz +Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Pod::Simple), perl(Test::Builder::Tester) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Pod::Simple) >= 2.04 +BuildRequires: perl(Test::Builder::Tester) >= 1.02 +BuildRequires: perl(Test::More) >= 0.62 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -35,7 +36,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -51,6 +52,12 @@ %changelog +* Fri Feb 3 2006 Jose Pedro Oliveira - 1.24-1 +- Update to 1.24. + +* Thu Dec 29 2005 Jose Pedro Oliveira - 1.22-1 +- Update to 1.22. + * Thu May 12 2005 Jose Pedro Oliveira - 1.20-3 - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Pod/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:09:05 -0000 1.2 +++ sources 3 Feb 2006 17:07:18 -0000 1.3 @@ -1 +1 @@ -2ccd3b460f817ccf6ac251f06cd2b4f4 Test-Pod-1.20.tar.gz +ebbc3e7a8128cee44f5289b13e4aac5e Test-Pod-1.24.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 17:07:55 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 3 Feb 2006 12:07:55 -0500 Subject: rpms/ncarg Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602031707.k13H7vtb022692@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22680 Added Files: Makefile import.log Log Message: Setup of module ncarg --- NEW FILE Makefile --- # Top level Makefile for module ncarg all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 3 17:08:01 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 3 Feb 2006 12:08:01 -0500 Subject: rpms/ncarg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602031708.k13H83o8022710@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22680/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ncarg --- NEW 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 Feb 3 17:12:03 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 3 Feb 2006 12:12:03 -0500 Subject: rpms/octave-forge/FC-4 octave-forge-2006.01.28.patch, NONE, 1.1 octave-forge.spec, 1.20, 1.21 Message-ID: <200602031712.k13HCZ4i022917@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-serv22855 Modified Files: octave-forge.spec Added Files: octave-forge-2006.01.28.patch Log Message: Patch to fix some files that weren't installed. octave-forge-2006.01.28.patch: --- NEW FILE octave-forge-2006.01.28.patch --- Index: admin/octlink.sh =================================================================== diff -ruP octave-forge-2006.01.28.orig/admin/octlink.sh octave-forge-2006.01.28/admin/octlink.sh --- admin/octlink.sh 1969-12-31 18:00:00.000000000 -0600 +++ admin/octlink.sh 2006-02-01 04:07:10.000000000 -0600 @@ -0,0 +1,6 @@ +#! /bin/sh + +FN2=`echo $2 | sed -e's/.octlink//'` +FN1=`echo $1 | sed -e's/.oct//'` +if test -e $2 ; then /bin/rm $2; fi +echo "autoload (\"$FN2\", which (\"$FN1\"));" > $2 Index: main/general/Makefile =================================================================== diff -ruP octave-forge-2006.01.28.orig/main/general/Makefile octave-forge-2006.01.28/main/general/Makefile --- main/general/Makefile 2006-01-11 14:57:22.000000000 -0600 +++ main/general/Makefile 2006-02-03 10:24:03.000000000 -0600 @@ -6,8 +6,8 @@ t2.9.0=isequal.m sortrows.m t2.9.4=blkdiag.m DEPRECIATED_TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.1.58))) \ - $($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0)) \ - $($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4)) + $($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0))) \ + $($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4))) PROGS=$(DEPRECIATED_TARGETS) command.oct deref.oct mark_for_deletion.oct all: $(PROGS) Index: main/set/Makefile =================================================================== diff -ruP octave-forge-2006.01.28.orig/main/set/Makefile octave-forge-2006.01.28/main/set/Makefile --- main/set/Makefile 1969-12-31 18:00:00.000000000 -0600 +++ main/set/Makefile 2006-02-03 07:08:16.000000000 -0600 @@ -0,0 +1,12 @@ +sinclude ../../Makeconf + +t2.9.0=ismember.m setdiff.m unique.m +DEPRECIATED_TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0))) + +all : $(DEPRECIATED_TARGETS) + +clean: ; -$(RM) core octave-core $(DEPRECIATED_TARGETS) *~ + +%.m: %.m.in + -$(INSTALL) $< $@ + Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- octave-forge.spec 30 Jan 2006 16:00:43 -0000 1.20 +++ octave-forge.spec 3 Feb 2006 17:12:03 -0000 1.21 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2006.01.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -15,6 +15,7 @@ ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version} ## rm -Rf octave-forge-%{version} Source0: %{name}-%{version}.patched.tar.gz +Patch0: octave-forge-2006.01.28.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: octave >= 2.1.69 ImageMagick @@ -32,6 +33,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -65,6 +67,9 @@ %changelog +* Fri Feb 3 2006 Quentin Spencer 2001.01.28-2 +- Patch to fix some files that were not installed. + * Mon Jan 30 2006 Quentin Spencer 2001.01.28-1 - New release. Remove old patch. - Change installation paths so they now depend on the octave API version From fedora-extras-commits at redhat.com Fri Feb 3 17:12:47 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 3 Feb 2006 12:12:47 -0500 Subject: rpms/ncarg import.log,1.1,1.2 Message-ID: <200602031713.k13HDJJ9023008@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927 Modified Files: import.log Log Message: auto-import ncarg-4.4.1-2 on branch devel from ncarg-4.4.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ncarg/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Feb 2006 17:07:55 -0000 1.1 +++ import.log 3 Feb 2006 17:12:47 -0000 1.2 @@ -0,0 +1 @@ +ncarg-4_4_1-2:HEAD:ncarg-4.4.1-2.src.rpm:1138986744 From fedora-extras-commits at redhat.com Fri Feb 3 17:12:53 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 3 Feb 2006 12:12:53 -0500 Subject: rpms/ncarg/devel Site.local, NONE, 1.1 ncarg-4.4.1-config.patch, NONE, 1.1 ncarg-4.4.1-include.patch, NONE, 1.1 ncarg.csh, NONE, 1.1 ncarg.sh, NONE, 1.1 ncarg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602031713.k13HDPxD023012@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927/devel Modified Files: .cvsignore sources Added Files: Site.local ncarg-4.4.1-config.patch ncarg-4.4.1-include.patch ncarg.csh ncarg.sh ncarg.spec Log Message: auto-import ncarg-4.4.1-2 on branch devel from ncarg-4.4.1-2.src.rpm --- NEW FILE Site.local --- /* * This file was created by the Configure script. */ #ifdef FirstSite #endif /* FirstSite */ #ifdef SecondSite #define YmakeRoot $(RPM_BUILD_ROOT)/usr #define ManRoot $(RPM_BUILD_ROOT)/usr/share/man #define LibRoot $(RPM_BUILD_ROOT)/usr/LIB/ncarg #define BuildWithF90 TRUE #define FCompiler gfortran #define CtoFLibraries -lgfortran -lm #define LibSearch -L/usr/lib64/hdf -L/usr/lib/hdf #define BuildUdunits FALSE #define UdUnitslib #define BuildHDFEOS FALSE #define HDFEOSlib #define BuildV5D TRUE #define BuildDODS FALSE #endif /* SecondSite */ ncarg-4.4.1-config.patch: --- NEW FILE ncarg-4.4.1-config.patch --- --- ncarg-4.4.1/config/LINUX.orig 2005-07-15 11:55:19.000000000 -0600 +++ ncarg-4.4.1/config/LINUX 2005-07-15 11:55:32.000000000 -0600 @@ -28,7 +28,6 @@ #define Cdynamic #define CppCommand '/usr/bin/cpp -traditional' #define CCompiler gcc -#define FCompiler g77 #define CtoFLibraries -lg2c -lgcc -lm #define CcOptions -ansi #define XToolLibrary -lXt -lSM -lICE ncarg-4.4.1-include.patch: --- NEW FILE ncarg-4.4.1-include.patch --- --- ncarg-4.4.1/common/src/libncarg_c/c.h.orig 2005-07-15 11:11:26.000000000 -0600 +++ ncarg-4.4.1/common/src/libncarg_c/c.h 2005-07-15 11:11:45.000000000 -0600 @@ -31,6 +31,7 @@ #define _ncarg_c_ #include +#include #include /* --- NEW FILE ncarg.csh --- setenv NCARG_ROOT /usr --- NEW FILE ncarg.sh --- export NCARG_ROOT=/usr --- NEW FILE ncarg.spec --- Name: ncarg Version: 4.4.1 Release: 2%{?dist} Summary: A Fortran and C based software package for scientific visualization Group: Development/Libraries License: GPL URL: http://ngwww.ucar.edu/ng4.4/index.html Source0: http://ngwww.ucar.edu/ngbin/ncarg-4.4.1.src.tar.gz Source1: Site.local Source2: ncarg.csh Source3: ncarg.sh Patch1: ncarg-4.4.1-config.patch Patch2: ncarg-4.4.1-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran >= 4.1.0, hdf-devel, libjpeg-devel BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel %description NCAR Graphics is a Fortran and C based software package for scientific visualization. %package devel Summary: A Fortran and C based software package for scientific visualization Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Include files and libraries for NCAR Graphics %prep %setup -q %patch1 -p1 -b .config %patch2 -p1 -b .include cp %{SOURCE1} config #Fix up the lib install dir sed -i -e s/LIB/%{_lib}/ config/Site.local %build export NCARG=`pwd` echo n | ./Configure make %{?_smp_mflags} Build %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING Copyright README %{_sysconfdir}/profile.d/ncarg.*sh %{_bindir}/ConvertMapData %{_bindir}/WriteLineFile %{_bindir}/WriteNameFile %{_bindir}/WritePlotcharData %{_bindir}/cgm2ncgm %{_bindir}/ctlib %{_bindir}/ctrans %{_bindir}/ezmapdemo %{_bindir}/fcaps %{_bindir}/findg %{_bindir}/fontc %{_bindir}/gcaps %{_bindir}/graphc %{_bindir}/ictrans %{_bindir}/idt %{_bindir}/med %{_bindir}/ncargfile %{_bindir}/ncargpath %{_bindir}/ncargrun %{_bindir}/ncargversion %{_bindir}/ncargworld %{_bindir}/ncarlogo2ps %{_bindir}/ncarvversion %{_bindir}/ncgm2cgm %{_bindir}/ncgmstat %{_bindir}/nnalg %{_bindir}/pre2ncgm %{_bindir}/pre2ncgm.prog %{_bindir}/psblack %{_bindir}/psplit %{_bindir}/pswhite %{_bindir}/pwritxnt %{_bindir}/ras2ccir601 %{_bindir}/rascat %{_bindir}/rasgetpal %{_bindir}/rasls %{_bindir}/rassplit %{_bindir}/rasstat %{_bindir}/rasview %{_bindir}/tdpackdemo %{_bindir}/tgks0a %{_bindir}/tlocal %dir %{_libdir}/ncarg %{_libdir}/ncarg/ncarg/database/ %{_libdir}/ncarg/ncarg/fontcaps/ %{_libdir}/ncarg/ncarg/graphcaps/ %{_libdir}/ncarg/ncarg/ngwww/ %{_libdir}/ncarg/ncarg/robj/ %{_libdir}/ncarg/ncarg/xapp/ %{_mandir}/man1/*.gz %{_mandir}/man3/*.gz %{_mandir}/man5/*.gz %files devel %{_bindir}/ncargcc %{_bindir}/ncargex %{_bindir}/ncargf90 %{_includedir}/ncarg/ %{_libdir}/ncarg/libcgm.a %{_libdir}/ncarg/libncarg.a %{_libdir}/ncarg/libncarg_c.a %{_libdir}/ncarg/libncarg_gks.a %{_libdir}/ncarg/libncarg_ras.a %{_libdir}/ncarg/libngmath.a %{_libdir}/ncarg/ncarg/examples/ %{_libdir}/ncarg/ncarg/tests/ %{_libdir}/ncarg/ncarg/tutorial/ %changelog * Wed Feb 1 2006 - Orion Poplawski - 4.4.1-2 - Move tutorial to -devel - Move libraries to ncarg subdir * Fri Jul 15 2005 - Orion Poplawski - 4.4.1-1 - Initial Fedora Extras build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ncarg/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Feb 2006 17:08:01 -0000 1.1 +++ .cvsignore 3 Feb 2006 17:12:53 -0000 1.2 @@ -0,0 +1 @@ +ncarg-4.4.1.src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ncarg/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Feb 2006 17:08:01 -0000 1.1 +++ sources 3 Feb 2006 17:12:53 -0000 1.2 @@ -0,0 +1 @@ +f62f226acc8b5588ff3537f28ac85a7d ncarg-4.4.1.src.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 17:21:39 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 3 Feb 2006 12:21:39 -0500 Subject: rpms/octave-forge/devel octave-forge-2006.01.28.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 octave-forge.spec, 1.14, 1.15 sources, 1.4, 1.5 octave-forge-2005.06.13-legend.patch, 1.1, NONE Message-ID: <200602031722.k13HMBxk023310@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23282 Modified Files: .cvsignore octave-forge.spec sources Added Files: octave-forge-2006.01.28.patch Removed Files: octave-forge-2005.06.13-legend.patch Log Message: New upstream sources. Several specfile changes. octave-forge-2006.01.28.patch: --- NEW FILE octave-forge-2006.01.28.patch --- Index: admin/octlink.sh =================================================================== diff -ruP octave-forge-2006.01.28.orig/admin/octlink.sh octave-forge-2006.01.28/admin/octlink.sh --- admin/octlink.sh 1969-12-31 18:00:00.000000000 -0600 +++ admin/octlink.sh 2006-02-01 04:07:10.000000000 -0600 @@ -0,0 +1,6 @@ +#! /bin/sh + +FN2=`echo $2 | sed -e's/.octlink//'` +FN1=`echo $1 | sed -e's/.oct//'` +if test -e $2 ; then /bin/rm $2; fi +echo "autoload (\"$FN2\", which (\"$FN1\"));" > $2 Index: main/general/Makefile =================================================================== diff -ruP octave-forge-2006.01.28.orig/main/general/Makefile octave-forge-2006.01.28/main/general/Makefile --- main/general/Makefile 2006-01-11 14:57:22.000000000 -0600 +++ main/general/Makefile 2006-02-03 10:24:03.000000000 -0600 @@ -6,8 +6,8 @@ t2.9.0=isequal.m sortrows.m t2.9.4=blkdiag.m DEPRECIATED_TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.1.58))) \ - $($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0)) \ - $($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4)) + $($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0))) \ + $($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4))) PROGS=$(DEPRECIATED_TARGETS) command.oct deref.oct mark_for_deletion.oct all: $(PROGS) Index: main/set/Makefile =================================================================== diff -ruP octave-forge-2006.01.28.orig/main/set/Makefile octave-forge-2006.01.28/main/set/Makefile --- main/set/Makefile 1969-12-31 18:00:00.000000000 -0600 +++ main/set/Makefile 2006-02-03 07:08:16.000000000 -0600 @@ -0,0 +1,12 @@ +sinclude ../../Makeconf + +t2.9.0=ismember.m setdiff.m unique.m +DEPRECIATED_TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0))) + +all : $(DEPRECIATED_TARGETS) + +clean: ; -$(RM) core octave-core $(DEPRECIATED_TARGETS) *~ + +%.m: %.m.in + -$(INSTALL) $< $@ + Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Jun 2005 13:31:52 -0000 1.4 +++ .cvsignore 3 Feb 2006 17:21:39 -0000 1.5 @@ -1 +1 @@ -octave-forge-2005.06.13.patched.tar.gz +octave-forge-2006.01.28.patched.tar.gz Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- octave-forge.spec 2 Nov 2005 14:23:51 -0000 1.14 +++ octave-forge.spec 3 Feb 2006 17:21:39 -0000 1.15 @@ -1,6 +1,6 @@ Name: octave-forge -Version: 2005.06.13 -Release: 5%{?dist} +Version: 2006.01.28 +Release: 1%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -15,15 +15,10 @@ ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version} ## rm -Rf octave-forge-%{version} Source0: %{name}-%{version}.patched.tar.gz -Patch0: %{name}-2005.06.13-legend.patch +Patch0: %{name}-2006.01.28.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -## Octave-forge installs in a directory tree specific to the installed -## version of octave, so the following version dependency is necessary. -%define octave_ep 6 -%define octave_ver %(echo "disp(octave_config_info.version)" | octave -qf) -Requires: octave = %{octave_ep}:%{octave_ver} ImageMagick +Requires: octave >= 2.9.4 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 @@ -39,6 +34,8 @@ %prep %setup -q %patch0 -p0 +# The sparse matrix functions are in octave 2.9.x so don't install them +touch main/sparse/NOINSTALL %build %configure @@ -46,17 +43,15 @@ %install rm -rf $RPM_BUILD_ROOT -%define host_type %(echo "disp(octave_config_info('canonical_host_type'))" | octave -qf) -%define site_dir octave/%{octave_ver}/site -make install prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - MPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/m/octave-forge \ - OPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/oct/%{host_type}/octave-forge \ - XPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/exec/%{host_type} \ - ALTPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m \ - ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m/octave-forge \ - ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/octave-forge-alternative/oct/%{host_type} +ALTPATHNAME=octave/site/octave-forge-alternative +HOSTTYPE=`octave-config -p CANONICAL_HOST_TYPE` +%makeinstall \ + MPATH=$RPM_BUILD_ROOT`octave-config -p LOCALFCNFILEDIR`/octave-forge \ + OPATH=$RPM_BUILD_ROOT`octave-config -p LOCALAPIOCTFILEDIR`/octave-forge \ + XPATH=$RPM_BUILD_ROOT`octave-config -p LOCALARCHLIBDIR`/octave-forge \ + ALTPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m \ + ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m/octave-forge \ + ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/$ALTPATHNAME/oct/$HOSTTYPE %clean rm -rf $RPM_BUILD_ROOT @@ -73,6 +68,12 @@ %changelog +* Fri Feb 3 2006 Quentin Spencer 2005.06.13-1 +- New upstream release. +- Patch so it will build correctly with octave 2.9.x. +- Change installation paths so they now depend on the octave API version + rather than the octave version, which will make updates less frequent. + * Wed Nov 2 2005 Quentin Spencer 2005.06.13-5 - Rebuild for new versions of ginac and cln. - Query octave to get octave version dependency. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Jun 2005 13:31:52 -0000 1.4 +++ sources 3 Feb 2006 17:21:39 -0000 1.5 @@ -1 +1 @@ -460aecb7aa96689901bd96a04e55fb40 octave-forge-2005.06.13.patched.tar.gz +8192ee6bc3784e35180623592de4303f octave-forge-2006.01.28.patched.tar.gz --- octave-forge-2005.06.13-legend.patch DELETED --- From fedora-extras-commits at redhat.com Fri Feb 3 17:56:24 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 3 Feb 2006 12:56:24 -0500 Subject: rpms/ncarg/devel ncarg.spec,1.1,1.2 Message-ID: <200602031756.k13Huu96023784@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ncarg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23757 Modified Files: ncarg.spec Log Message: Add libXpm-devel Index: ncarg.spec =================================================================== RCS file: /cvs/extras/rpms/ncarg/devel/ncarg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncarg.spec 3 Feb 2006 17:12:53 -0000 1.1 +++ ncarg.spec 3 Feb 2006 17:56:24 -0000 1.2 @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran >= 4.1.0, hdf-devel, libjpeg-devel -BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel +BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel %description NCAR Graphics is a Fortran and C based software package for scientific From fedora-extras-commits at redhat.com Fri Feb 3 18:45:43 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 3 Feb 2006 13:45:43 -0500 Subject: rpms/octave-forge/devel octave-forge.spec,1.15,1.16 Message-ID: <200602031846.k13IkFZb025866@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25849 Modified Files: octave-forge.spec Log Message: Add new buildrequires to build with modular X and enable new features. Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- octave-forge.spec 3 Feb 2006 17:21:39 -0000 1.15 +++ octave-forge.spec 3 Feb 2006 18:45:43 -0000 1.16 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2006.01.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -19,9 +19,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: octave >= 2.9.4 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 +BuildRequires: octave-devel tetex gcc-gfortran ginac-devel qhull-devel +BuildRequires: ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel +BuildRequires: libjpeg-devel libpng-devel ncurses-devel libtermcap-devel %description Octave-forge is a community project for collaborative development of @@ -38,6 +38,7 @@ touch main/sparse/NOINSTALL %build +export CPPFLAGS=-I%{_includedir}/netcdf-3 %configure make %{?_smp_mflags} @@ -68,6 +69,12 @@ %changelog +* Fri Feb 3 2006 Quentin Spencer 2005.06.13-2 +- Add new build dependencies on ImageMagick-c++-devel and netcdf-devel. + (The ImageMagick-c++-devel indirectly brings in the necessary + modular X devel modules, such as libXt-devel and others). +- Define CPPFLAGS so it finds the netcdf headers. + * Fri Feb 3 2006 Quentin Spencer 2005.06.13-1 - New upstream release. - Patch so it will build correctly with octave 2.9.x. From fedora-extras-commits at redhat.com Fri Feb 3 19:54:09 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 3 Feb 2006 14:54:09 -0500 Subject: fedora-security/audit fc4,1.144,1.145 fc5,1.53,1.54 Message-ID: <200602031954.k13Js9sr027956@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27936 Modified Files: fc4 fc5 Log Message: Deal with kde* fc4 update Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- fc4 3 Feb 2006 08:45:28 -0000 1.144 +++ fc4 3 Feb 2006 19:54:01 -0000 1.145 @@ -52,11 +52,11 @@ CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.2 -CVE-2006-0019 backport (kdelibs) [since FEDORA-2006-050] +CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4685 VULNERABLE (mozilla) CVE-2005-4685 VULNERABLE (firefox) -CVE-2005-4684 VULNERABLE (kdebase) +CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream CVE-2005-4667 VULNERABLE (unzip) bz#178961 CVE-2005-4639 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] CVE-2005-4636 version (openoffice.org, fixed 2.0.1) @@ -105,26 +105,26 @@ CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169] CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3628 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 -CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160] +CVE-2005-3628 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3628 backport (cups) [since FEDORA-2005-1142] CVE-2005-3627 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3627 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160] +CVE-2005-3627 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3627 backport (cups) [since FEDORA-2006-010] CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] CVE-2005-3626 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3626 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160] +CVE-2005-3626 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3626 backport (cups) [since FEDORA-2006-010] CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] CVE-2005-3625 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3625 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160] +CVE-2005-3625 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3625 backport (cups) [since FEDORA-2006-010] CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] CVE-2005-3624 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3624 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160] +CVE-2005-3624 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] 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 @@ -167,17 +167,17 @@ CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169] CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3193 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 -CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160] +CVE-2005-3193 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3193 backport (cups) [since FEDORA-2005-1142] CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169] CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3192 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 -CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160] +CVE-2005-3192 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3192 backport (cups) [since FEDORA-2005-1142] CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169] CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3191 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 -CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160] +CVE-2005-3191 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3191 backport (cups) [since FEDORA-2005-1142] CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088] CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- fc5 3 Feb 2006 08:45:28 -0000 1.53 +++ fc5 3 Feb 2006 19:54:01 -0000 1.54 @@ -65,11 +65,11 @@ CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916 CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916 -CVE-2006-0019 VULNERABLE (kdelibs) +CVE-2006-0019 VULNERABLE (kdelibs, fixed 3.5.1) CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4685 VULNERABLE (mozilla) CVE-2005-4685 VULNERABLE (firefox) -CVE-2005-4684 VULNERABLE (kdebase) +CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream CVE-2005-4667 VULNERABLE (unzip) bz#178961 CVE-2005-4639 version (kernel, fixed 2.6.15) CVE-2005-4636 version (openoffice.org, fixed 2.0.1) @@ -117,27 +117,27 @@ CVE-2005-3628 VULNERABLE (xpdf) bz#177911:rawhide CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide -CVE-2005-3628 VULNERABLE (kdegraphics) bz#177908:rawhide +CVE-2005-3628 VULNERABLE (kdegraphics, fixed 3.5.1) bz#177908:rawhide CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch CVE-2005-3627 VULNERABLE (xpdf) bz#177911:rawhide CVE-2005-3627 VULNERABLE (tetex) bz#177912:rawhide CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide -CVE-2005-3627 VULNERABLE (kdegraphics) bz#177908:rawhide +CVE-2005-3627 VULNERABLE (kdegraphics, fixed 3.5.1) bz#177908:rawhide CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch CVE-2005-3626 VULNERABLE (xpdf) bz#177911:rawhide CVE-2005-3626 VULNERABLE (tetex) bz#177912:rawhide CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide -CVE-2005-3626 VULNERABLE (kdegraphics) bz#177908:rawhide +CVE-2005-3626 VULNERABLE (kdegraphics, fixed 3.5.1) bz#177908:rawhide CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch CVE-2005-3625 VULNERABLE (xpdf) bz#177911:rawhide CVE-2005-3625 VULNERABLE (tetex) bz#177912:rawhide CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide -CVE-2005-3625 VULNERABLE (kdegraphics) bz#177908:rawhide +CVE-2005-3625 VULNERABLE (kdegraphics, fixed 3.5.1) bz#177908:rawhide CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch CVE-2005-3624 VULNERABLE (xpdf) bz#177911:rawhide CVE-2005-3624 VULNERABLE (tetex) bz#177912:rawhide CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide -CVE-2005-3624 VULNERABLE (kdegraphics) bz#177908:rawhide +CVE-2005-3624 VULNERABLE (kdegraphics, fixed 3.5.1) bz#177908:rawhide CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch CVE-2005-3623 version (kernel, fixed 2.6.14.5) CVE-2005-3582 version (ImageMagick) gentoo only @@ -150,10 +150,10 @@ CVE-2005-3389 version (php, fixed 5.1.1) CVE-2005-3388 version (php, fixed 5.1.1) CVE-2005-3358 version (kernel, fixed 2.6.11) -CVE-2005-3357 VULNERABLE (httpd, affects 2.2.0) bz#177914 +CVE-2005-3357 VULNERABLE (httpd, affects 2.2.0) bz#177914:rawhide CVE-2005-3356 VULNERABLE (kernel) CVE-2005-3353 version (php, not 5.0) -CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1) bz#177913 +CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1) bz#177913:rawhide CVE-2005-3351 version (spamassassin, fixed 3.1.0) CVE-2005-3322 version (squid) not upstream, SUSE only CVE-2005-3319 ignore (mod_php) no security consequence @@ -179,17 +179,17 @@ 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 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide -CVE-2005-3193 VULNERABLE (kdegraphics) bz#177908:rawhide +CVE-2005-3193 VULNERABLE (kdegraphics, fixed 3.5.1) bz#177908:rawhide CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911:rawhide 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 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide -CVE-2005-3192 VULNERABLE (kdegraphics) bz#177908:rawhide +CVE-2005-3192 VULNERABLE (kdegraphics, fixed 3.5.1) bz#177908:rawhide CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911:rawhide 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 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide -CVE-2005-3191 VULNERABLE (kdegraphics) bz#177908:rawhide +CVE-2005-3191 VULNERABLE (kdegraphics, fixed 3.5.1) bz#177908:rawhide 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) From fedora-extras-commits at redhat.com Fri Feb 3 20:14:03 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 3 Feb 2006 15:14:03 -0500 Subject: rpms/xfce4-netload-plugin/FC-4 xfce4-netload-plugin-bufsize.patch, NONE, 1.1 xfce4-netload-plugin.spec, 1.1, 1.2 Message-ID: <200602032014.k13KEa6A029941@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-netload-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29920 Modified Files: xfce4-netload-plugin.spec Added Files: xfce4-netload-plugin-bufsize.patch Log Message: release 4 to fix #179686 xfce4-netload-plugin-bufsize.patch: --- NEW FILE xfce4-netload-plugin-bufsize.patch --- --- panel-plugin/wormulon/linux.c.orig 2006-02-03 20:48:17.000000000 +0100 +++ panel-plugin/wormulon/linux.c 2005-08-01 00:56:38.000000000 +0200 @@ -101,11 +101,11 @@ /* do not parse the first two lines as they only contain static garbage */ fseek(proc_net_dev, 0, SEEK_SET); - fgets(buffer, BUFSIZ-1, proc_net_dev); - fgets(buffer, BUFSIZ-1, proc_net_dev); + fgets(buffer, BUFSIZE-1, proc_net_dev); + fgets(buffer, BUFSIZE-1, proc_net_dev); interfacefound = 0; - while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL) + while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL) { /* find the device name and substitute ':' with '\0' */ ptr = buffer; Index: xfce4-netload-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-4/xfce4-netload-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-netload-plugin.spec 22 Jan 2006 23:40:16 -0000 1.1 +++ xfce4-netload-plugin.spec 3 Feb 2006 20:14:03 -0000 1.2 @@ -1,12 +1,13 @@ Name: xfce4-netload-plugin Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops License: GPL URL: http://xfce-goodies.berlios.de/ Source0: http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2 +Patch0: xfce4-netload-plugin-bufsize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p0 -b .orig %build %configure --disable-static @@ -37,6 +39,9 @@ %{_libdir}/xfce4/panel-plugins/*.so %changelog +* Thu Feb 02 2006 Christoph Wickert - 0.3.3-4 +- Add bufsize-patch (#179686) + * Thu Dec 01 2005 Christoph Wickert - 0.3.3-3 - Add libxfcegui4-devel BuildReqs. - Fix %defattr. From fedora-extras-commits at redhat.com Fri Feb 3 20:20:42 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 3 Feb 2006 15:20:42 -0500 Subject: rpms/xfce4-netload-plugin/FC-3 xfce4-netload-plugin-bufsize.patch, NONE, 1.1 xfce4-netload-plugin.spec, 1.1, 1.2 Message-ID: <200602032021.k13KLEwF030049@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-netload-plugin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30029 Modified Files: xfce4-netload-plugin.spec Added Files: xfce4-netload-plugin-bufsize.patch Log Message: release 4 to fix #179686 xfce4-netload-plugin-bufsize.patch: --- NEW FILE xfce4-netload-plugin-bufsize.patch --- --- panel-plugin/wormulon/linux.c.orig 2006-02-03 20:48:17.000000000 +0100 +++ panel-plugin/wormulon/linux.c 2005-08-01 00:56:38.000000000 +0200 @@ -101,11 +101,11 @@ /* do not parse the first two lines as they only contain static garbage */ fseek(proc_net_dev, 0, SEEK_SET); - fgets(buffer, BUFSIZ-1, proc_net_dev); - fgets(buffer, BUFSIZ-1, proc_net_dev); + fgets(buffer, BUFSIZE-1, proc_net_dev); + fgets(buffer, BUFSIZE-1, proc_net_dev); interfacefound = 0; - while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL) + while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL) { /* find the device name and substitute ':' with '\0' */ ptr = buffer; Index: xfce4-netload-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-3/xfce4-netload-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-netload-plugin.spec 22 Jan 2006 23:40:16 -0000 1.1 +++ xfce4-netload-plugin.spec 3 Feb 2006 20:20:42 -0000 1.2 @@ -1,12 +1,13 @@ Name: xfce4-netload-plugin Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops License: GPL URL: http://xfce-goodies.berlios.de/ Source0: http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2 +Patch0: xfce4-netload-plugin-bufsize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p0 -b .orig %build %configure --disable-static @@ -37,6 +39,9 @@ %{_libdir}/xfce4/panel-plugins/*.so %changelog +* Thu Feb 02 2006 Christoph Wickert - 0.3.3-4 +- Add bufsize-patch (#179686) + * Thu Dec 01 2005 Christoph Wickert - 0.3.3-3 - Add libxfcegui4-devel BuildReqs. - Fix %defattr. From fedora-extras-commits at redhat.com Fri Feb 3 20:22:38 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 3 Feb 2006 15:22:38 -0500 Subject: rpms/xfce4-netload-plugin/devel xfce4-netload-plugin-bufsize.patch, NONE, 1.1 xfce4-netload-plugin.spec, 1.1, 1.2 Message-ID: <200602032023.k13KNBsm030110@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-netload-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30090 Modified Files: xfce4-netload-plugin.spec Added Files: xfce4-netload-plugin-bufsize.patch Log Message: release 4 to fix #179686 xfce4-netload-plugin-bufsize.patch: --- NEW FILE xfce4-netload-plugin-bufsize.patch --- --- panel-plugin/wormulon/linux.c.orig 2006-02-03 20:48:17.000000000 +0100 +++ panel-plugin/wormulon/linux.c 2005-08-01 00:56:38.000000000 +0200 @@ -101,11 +101,11 @@ /* do not parse the first two lines as they only contain static garbage */ fseek(proc_net_dev, 0, SEEK_SET); - fgets(buffer, BUFSIZ-1, proc_net_dev); - fgets(buffer, BUFSIZ-1, proc_net_dev); + fgets(buffer, BUFSIZE-1, proc_net_dev); + fgets(buffer, BUFSIZE-1, proc_net_dev); interfacefound = 0; - while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL) + while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL) { /* find the device name and substitute ':' with '\0' */ ptr = buffer; Index: xfce4-netload-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-netload-plugin.spec 22 Jan 2006 23:40:16 -0000 1.1 +++ xfce4-netload-plugin.spec 3 Feb 2006 20:22:38 -0000 1.2 @@ -1,12 +1,13 @@ Name: xfce4-netload-plugin Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops License: GPL URL: http://xfce-goodies.berlios.de/ Source0: http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2 +Patch0: xfce4-netload-plugin-bufsize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p0 -b .orig %build %configure --disable-static @@ -37,6 +39,9 @@ %{_libdir}/xfce4/panel-plugins/*.so %changelog +* Thu Feb 02 2006 Christoph Wickert - 0.3.3-4 +- Add bufsize-patch (#179686) + * Thu Dec 01 2005 Christoph Wickert - 0.3.3-3 - Add libxfcegui4-devel BuildReqs. - Fix %defattr. From fedora-extras-commits at redhat.com Fri Feb 3 21:36:29 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 3 Feb 2006 16:36:29 -0500 Subject: owners owners.list,1.602,1.603 Message-ID: <200602032137.k13Lb13I032358@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32341 Modified Files: owners.list Log Message: Add ncarg Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.602 retrieving revision 1.603 diff -u -r1.602 -r1.603 --- owners.list 3 Feb 2006 16:01:23 -0000 1.602 +++ owners.list 3 Feb 2006 21:36:29 -0000 1.603 @@ -658,6 +658,7 @@ Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|nautilus-sendto|Nautilus context menu for sending files|stickster at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|ncarg|A Fortran and C based software package for scientific visualization|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|ncftp|Improved console FTP client|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ncmpc|A curses client for the Music Player Daemon (MPD)|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|nco|Suite of programs for manipulating NetCDF/HDF4 files|ed at eh3.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Feb 3 21:56:39 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 3 Feb 2006 16:56:39 -0500 Subject: rpms/octave-forge/devel octave-forge-2006.01.28.patch, 1.1, 1.2 octave-forge.spec, 1.16, 1.17 Message-ID: <200602032157.k13LvCem032563@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32539 Modified Files: octave-forge-2006.01.28.patch octave-forge.spec Log Message: Fix permissions on octlink.sh and do some more patching. octave-forge-2006.01.28.patch: Index: octave-forge-2006.01.28.patch =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge-2006.01.28.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- octave-forge-2006.01.28.patch 3 Feb 2006 17:21:39 -0000 1.1 +++ octave-forge-2006.01.28.patch 3 Feb 2006 21:56:39 -0000 1.2 @@ -44,3 +44,17 @@ +%.m: %.m.in + -$(INSTALL) $< $@ + +Index: main/image/Makefile +=================================================================== +diff -ruP octave-forge-2006.01.28.orig/main/image/Makefile octave-forge-2006.01.28/main/image/Makefile +--- main/image/Makefile 2006-01-06 23:11:58.000000000 -0600 ++++ main/image/Makefile 2006-02-03 15:34:38.000000000 -0600 +@@ -9,7 +9,7 @@ + endif + + ifdef HAVE_MAGICKXX +- IMAGEMAGICK=__imagemagick__.oct __magick_read__.oct ++ IMAGEMAGICK=__imagemagick__.oct __magick_read__$(OCTLINK) + endif + + all: conv2.oct cordflt2.oct bwlabel.oct bwfill.oct rotate_scale.oct \ Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- octave-forge.spec 3 Feb 2006 18:45:43 -0000 1.16 +++ octave-forge.spec 3 Feb 2006 21:56:39 -0000 1.17 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2006.01.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -36,6 +36,7 @@ %patch0 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL +chmod +x admin/octlink.sh %build export CPPFLAGS=-I%{_includedir}/netcdf-3 @@ -69,6 +70,9 @@ %changelog +* Fri Feb 3 2006 Quentin Spencer 2005.06.13-3 +- Fix permissions on octlink.sh and add more to the patch. + * Fri Feb 3 2006 Quentin Spencer 2005.06.13-2 - Add new build dependencies on ImageMagick-c++-devel and netcdf-devel. (The ImageMagick-c++-devel indirectly brings in the necessary From fedora-extras-commits at redhat.com Fri Feb 3 22:12:15 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Fri, 3 Feb 2006 17:12:15 -0500 Subject: rpms/ruby-mysql - New directory Message-ID: <200602032212.k13MCHES002183@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/rpms/ruby-mysql In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2174/ruby-mysql Log Message: Directory /cvs/extras/rpms/ruby-mysql added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 22:12:22 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Fri, 3 Feb 2006 17:12:22 -0500 Subject: rpms/ruby-mysql/devel - New directory Message-ID: <200602032212.k13MCOEE002198@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/rpms/ruby-mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2174/ruby-mysql/devel Log Message: Directory /cvs/extras/rpms/ruby-mysql/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 22:12:58 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Fri, 3 Feb 2006 17:12:58 -0500 Subject: rpms/ruby-mysql Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602032213.k13MD05U002247@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/rpms/ruby-mysql In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2235 Added Files: Makefile import.log Log Message: Setup of module ruby-mysql --- NEW FILE Makefile --- # Top level Makefile for module ruby-mysql all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Feb 3 22:13:13 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Fri, 3 Feb 2006 17:13:13 -0500 Subject: rpms/ruby-mysql/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602032213.k13MDFWO002270@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/rpms/ruby-mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2235/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ruby-mysql --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Feb 3 22:14:02 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Fri, 3 Feb 2006 17:14:02 -0500 Subject: rpms/ruby-mysql import.log,1.1,1.2 Message-ID: <200602032214.k13MEY2l002384@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/rpms/ruby-mysql In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320 Modified Files: import.log Log Message: auto-import ruby-mysql-2.7-5 on branch devel from ruby-mysql-2.7-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ruby-mysql/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Feb 2006 22:12:57 -0000 1.1 +++ import.log 3 Feb 2006 22:14:01 -0000 1.2 @@ -0,0 +1 @@ +ruby-mysql-2_7-5:HEAD:ruby-mysql-2.7-5.src.rpm:1139004833 From fedora-extras-commits at redhat.com Fri Feb 3 22:14:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Feb 2006 17:14:44 -0500 Subject: rpms/cpanspec - New directory Message-ID: <200602032214.k13MEk0I002399@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2391/cpanspec Log Message: Directory /cvs/extras/rpms/cpanspec added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 22:14:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Feb 2006 17:14:50 -0500 Subject: rpms/cpanspec/devel - New directory Message-ID: <200602032214.k13MEqcO002414@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2391/cpanspec/devel Log Message: Directory /cvs/extras/rpms/cpanspec/devel added to the repository From fedora-extras-commits at redhat.com Fri Feb 3 22:14:22 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Fri, 3 Feb 2006 17:14:22 -0500 Subject: rpms/ruby-mysql/devel ruby-mysql.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602032214.k13MEsK3002418@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/rpms/ruby-mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/devel Modified Files: .cvsignore sources Added Files: ruby-mysql.spec Log Message: auto-import ruby-mysql-2.7-5 on branch devel from ruby-mysql-2.7-5.src.rpm --- NEW FILE ruby-mysql.spec --- Name: ruby-mysql Version: 2.7 Release: 5%{?dist} Summary: A Ruby interface to MySQL Group: Development/Languages License: GPL URL: http://www.tmtm.org/en/mysql/ruby/ Source0: http://tmtm.org/downloads/mysql/ruby/mysql-ruby-2.7.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby ruby-devel mysql-devel %description This is the MySQL API module for Ruby. It provides the same functions for Ruby programs that the MySQL C API provides for C programs. %prep %setup -q -n mysql-ruby-%{version} %build ruby extconf.rb --with-mysql-config make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT env DESTDIR=$RPM_BUILD_ROOT make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README.html README_ja.html tommy.css COPYING COPYING.ja %{_libdir}/site_ruby/1.8/i386-linux/mysql.so %changelog * Fri Feb 03 2006 Oliver Andrich - 2.7-5 - included the license documents COPYING and COPYING.ja - fixed the license: Distributable -> GPL * Sun Jan 22 2006 Oliver Andrich - 2.7-4 - fixed changelog (next try) - moved the package to the suggested group Development/Languages - added %{?_smp_mflags} to the make call in the build phase - the summary duplication in the description was removed * Sun Jan 22 2006 Oliver Andrich - 2.7-3 - added documentation - fixed changelog * Sun Jan 22 2006 Oliver Andrich - 2.7-1 - First build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-mysql/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Feb 2006 22:13:13 -0000 1.1 +++ .cvsignore 3 Feb 2006 22:14:22 -0000 1.2 @@ -0,0 +1 @@ +mysql-ruby-2.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-mysql/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Feb 2006 22:13:13 -0000 1.1 +++ sources 3 Feb 2006 22:14:22 -0000 1.2 @@ -0,0 +1 @@ +c6668900e68f0d6a137612c818d5fd01 mysql-ruby-2.7.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 22:15:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Feb 2006 17:15:56 -0500 Subject: rpms/cpanspec Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602032215.k13MFwcT002459@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2447 Added Files: Makefile import.log Log Message: Setup of module cpanspec --- NEW FILE Makefile --- # Top level Makefile for module cpanspec all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 3 22:16:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Feb 2006 17:16:02 -0500 Subject: rpms/cpanspec/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602032216.k13MG40D002477@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2447/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cpanspec --- NEW 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 Feb 3 22:18:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Feb 2006 17:18:04 -0500 Subject: rpms/cpanspec import.log,1.1,1.2 Message-ID: <200602032218.k13MIaq4002603@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2560 Modified Files: import.log Log Message: auto-import cpanspec-1.59-2 on branch devel from cpanspec-1.59-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cpanspec/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Feb 2006 22:15:56 -0000 1.1 +++ import.log 3 Feb 2006 22:18:04 -0000 1.2 @@ -0,0 +1 @@ +cpanspec-1_59-2:HEAD:cpanspec-1.59-2.src.rpm:1139005050 From fedora-extras-commits at redhat.com Fri Feb 3 22:18:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Feb 2006 17:18:10 -0500 Subject: rpms/cpanspec/devel cpanspec.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602032219.k13MJ9HL002620@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2560/devel Modified Files: .cvsignore sources Added Files: cpanspec.spec Log Message: auto-import cpanspec-1.59-2 on branch devel from cpanspec-1.59-2.src.rpm --- NEW FILE cpanspec.spec --- Name: cpanspec Version: 1.59 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 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 cpanspec generates spec files for Perl modules from CPAN for Fedora Extras. The quality of the spec file is our primary concern. It is assumed that maintainers will need to do some (hopefully small) amount of work to clean up the generated spec file to make the package build and to verify that all of the information contained in the spec file is correct. %prep %setup -q %build perl Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic # No tests. #%check #./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING Artistic %{_bindir}/* %{_mandir}/man1/* %changelog * Wed Feb 01 2006 Steven Pritchard 1.59-2 - URL/Source0 on SourceForge. - Use a more appropriate Group. * Tue Sep 20 2005 Steven Pritchard 1.59-1 - Update to 1.59. * Mon Sep 19 2005 Steven Pritchard 1.58-1 - Update to 1.58. - Comment out bogus URL and Source0 URL. * Fri Sep 16 2005 Steven Pritchard 1.55-1 - Update to 1.55. - Include man page. - Drop explicit module dependencies. (rpmbuild will figure it out.) * Fri Sep 16 2005 Steven Pritchard 1.54-1 - Update to 1.54. * Mon Sep 05 2005 Steven Pritchard 1.49-1 - Update to 1.49. - Remove unneeded BuildRequires (no tests). - Remove explicit core module requirements. * Sat Sep 03 2005 Steven Pritchard 1.46-1 - Initial rpm release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Feb 2006 22:16:02 -0000 1.1 +++ .cvsignore 3 Feb 2006 22:18:10 -0000 1.2 @@ -0,0 +1 @@ +cpanspec-1.59.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Feb 2006 22:16:02 -0000 1.1 +++ sources 3 Feb 2006 22:18:10 -0000 1.2 @@ -0,0 +1 @@ +3ed3cc74eeda4b7ad2d04534013c7672 cpanspec-1.59.tar.gz From fedora-extras-commits at redhat.com Fri Feb 3 22:19:53 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Fri, 3 Feb 2006 17:19:53 -0500 Subject: owners owners.list,1.603,1.604 Message-ID: <200602032220.k13MKQCh002708@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2666 Modified Files: owners.list Log Message: Added ruby-mysql Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.603 retrieving revision 1.604 diff -u -r1.603 -r1.604 --- owners.list 3 Feb 2006 21:36:29 -0000 1.603 +++ owners.list 3 Feb 2006 22:19:53 -0000 1.604 @@ -1139,6 +1139,7 @@ Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org| +Fedora Extras|ruby-mysql|A Ruby interface to MySQL|oliver.andrich at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Feb 3 23:33:40 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 3 Feb 2006 18:33:40 -0500 Subject: rpms/kphone/devel kphone-gcc41.patch, NONE, 1.1 kphone.spec, 1.20, 1.21 Message-ID: <200602032334.k13NYDTV004754@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4718 Modified Files: kphone.spec Added Files: kphone-gcc41.patch Log Message: Patch for gcc 4.1 kphone-gcc41.patch: --- NEW FILE kphone-gcc41.patch --- diff -Nur kphone-orig/kphone/kcallwidget.h kphone/kphone/kcallwidget.h --- kphone-orig/kphone/kcallwidget.h 2005-04-18 08:04:40.000000000 -0500 +++ kphone/kphone/kcallwidget.h 2006-02-03 06:58:25.000000000 -0600 @@ -67,7 +67,7 @@ void clickHangup( void ); void setHide( void ); bool isHided( void ) const { return hided; } - void KCallWidget::setDTMFSender( QString &s ); + void setDTMFSender( QString &s ); public slots: void pleaseDial( const SipUri &dialuri ); diff -Nur kphone-orig/kphone/kphoneview.h kphone/kphone/kphoneview.h --- kphone-orig/kphone/kphoneview.h 2005-04-18 08:04:40.000000000 -0500 +++ kphone/kphone/kphoneview.h 2006-02-03 06:58:58.000000000 -0600 @@ -54,7 +54,7 @@ QString getStunSrv( void ); void kphoneQuit( void ); bool getState( void ); - KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype ); + KCallWidget *DoCall( QString num, SipCall::CallType ctype ); signals: void stateChanged( void ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- kphone.spec 22 Dec 2005 05:14:24 -0000 1.20 +++ kphone.spec 3 Feb 2006 23:33:40 -0000 1.21 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -12,6 +12,7 @@ Patch1: kphone-4.1.0-endian.patch Patch2: kphone-4.1.0-strip.patch Patch3: kphone-4.2-callaudio-stun-init.patch +Patch4: kphone-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -26,6 +27,7 @@ %setup -q -n kphone %patch1 -p1 -b .endian %patch2 -p1 -b .strip +%patch4 -p1 -b .gcc41 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -58,6 +60,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Fri Feb 02 2006 Dennis Gilmore 4.2-5 +- patch for gcc 4.1 + * Wed Dec 21 2005 Dennis Gilmore 4.2-4 -rebuild for new gcc :) From fedora-extras-commits at redhat.com Sat Feb 4 00:36:59 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Feb 2006 19:36:59 -0500 Subject: rpms/koffice/devel koffice-kotext-lines.patch, NONE, 1.1 koffice.spec, 1.26, 1.27 Message-ID: <200602040037.k140bVZQ006818@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6777 Modified Files: koffice.spec Added Files: koffice-kotext-lines.patch Log Message: - different configure options (should speed up build) - sane way of .so{,.*} handling... koffice-kotext-lines.patch: --- NEW FILE koffice-kotext-lines.patch --- --- trunk/koffice/lib/kotext/KoComplexText.cpp 2005/12/02 00:53:59 484817 +++ trunk/koffice/lib/kotext/KoComplexText.cpp 2006/02/01 11:16:49 504496 @@ -855,8 +855,8 @@ } #endif -#define BIDI_DEBUG 0 // 2 -#if (BIDI_DEBUG >= 1) +//#define BIDI_DEBUG +#ifdef BIDI_DEBUG #include #endif @@ -933,7 +933,7 @@ dirCurrent = text.at(current).direction(); -#if (BIDI_DEBUG >= 2) +#ifdef BIDI_DEBUG cout << "directions: dir=" << dir << " current=" << dirCurrent << " last=" << status.last << " eor=" << status.eor << " lastStrong=" << status.lastStrong << " embedding=" << context->dir << " level =" << (int)context->level << endl; #endif @@ -1311,7 +1311,7 @@ ++current; } -#if (BIDI_DEBUG >= 1) +#ifdef BIDI_DEBUG cout << "reached end of line current=" << current << ", eor=" << eor << endl; #endif eor = current - 1; // remove dummy char @@ -1341,7 +1341,7 @@ // reversing is only done up to the lowest odd level if(!(levelLow%2)) levelLow++; -#if (BIDI_DEBUG >= 1) +#ifdef BIDI_DEBUG cout << "reorderLine: lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl; cout << "logical order is:" << endl; QPtrListIterator it2(*runs); @@ -1379,7 +1379,7 @@ levelHigh--; } -#if (BIDI_DEBUG >= 1) +#ifdef BIDI_DEBUG cout << "visual order is:" << endl; QPtrListIterator it3(*runs); KoTextRun *r3; @@ -1468,7 +1468,7 @@ else if( dir == QChar::DirAN ) level += 2; } -#if (BIDI_DEBUG >= 1) +#ifdef BIDI_DEBUG printf("new run: dir=%d from %d, to %d level = %d\n", dir, _start, _stop, level); #endif } Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- koffice.spec 3 Feb 2006 13:01:43 -0000 1.26 +++ koffice.spec 4 Feb 2006 00:36:58 -0000 1.27 @@ -11,7 +11,8 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch - +# Fix --enable-final +Patch1: koffice-kotext-lines.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -209,6 +210,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p2 # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -220,7 +222,8 @@ --enable-fast-install --with-pic --disable-static \ --with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \ --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \ ---with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} +--with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \ +--enable-final --enable-kexi-reports make @@ -260,14 +263,6 @@ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop -# kformdesigner -# desktop-file-install \ -# --vendor=fedora \ -# --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ -# --add-category=X-Fedora \ -# --delete-original \ -# $RPM_BUILD_ROOT%{_datadir}/applications/kde/kformdesigner.desktop - #kword desktop-file-install \ --vendor=fedora \ @@ -414,8 +409,7 @@ $RPM_BUILD_ROOT%{_datadir}/applnk/Office/writeup.desktop -# maybe we should try without la again... -find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \; +rm $RPM_BUILD_ROOT/%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -468,22 +462,22 @@ %{_bindir}/koshell %{_bindir}/kthesaurus %{_bindir}/koconverter -%{_libdir}/libkdeinit_koshell.* -%{_libdir}/libkdeinit_kthesaurus.* -%{_libdir}/libkdchart.* -%{_libdir}/libkochart.* -%{_libdir}/libkofficecore.* -%{_libdir}/libkofficeui.* -%{_libdir}/libkotext.* -%{_libdir}/libkowmf.* -%{_libdir}/libkopainter.* -%{_libdir}/libkstore.* -%{_libdir}/libkwmailmerge_interface.* -%{_libdir}/libkwmf.* -%{_libdir}/libkdeinit_kformula.* -%{_libdir}/libkformulalib.* -%{_libdir}/libkopalette.* -%{_libdir}/libkoproperty.* +%{_libdir}/libkdeinit_koshell.so +%{_libdir}/libkdeinit_kthesaurus.so +%{_libdir}/libkdchart.so.* +%{_libdir}/libkochart.so.* +%{_libdir}/libkofficecore.so.* +%{_libdir}/libkofficeui.so.* +%{_libdir}/libkotext.so.* +%{_libdir}/libkowmf.so.* +%{_libdir}/libkopainter.so.* +%{_libdir}/libkstore.so.* +%{_libdir}/libkwmailmerge_interface.so.* +%{_libdir}/libkwmf.so.* +%{_libdir}/libkdeinit_kformula.so +%{_libdir}/libkformulalib.so.* +%{_libdir}/libkopalette.so.* +%{_libdir}/libkoproperty.so.* %{_libdir}/kde3/kfile_koffice.* %{_libdir}/kde3/kfile_ooo.* %{_libdir}/kde3/kfile_abiword.* @@ -535,7 +529,7 @@ %{_bindir}/writeup %{_libdir}/kde3/libwriteup_part.* %{_libdir}/kde3/writeup.* -%{_libdir}/libkdeinit_writeup.* +%{_libdir}/libkdeinit_writeup.so %{_datadir}/applications/fedora-writeup.desktop %{_datadir}/apps/writeup %{_datadir}/services/writeuppart.desktop @@ -543,12 +537,13 @@ %files devel %{_includedir}/* %{_datadir}/doc/HTML/en/koffice-apidocs +%{_libdir}/*.so %files kword %defattr(-,root,root,-) %{_bindir}/kword -%{_libdir}/libkdeinit_kword.* -%{_libdir}/libkwordprivate.* +%{_libdir}/libkdeinit_kword.so +%{_libdir}/libkwordprivate.so.* %{_libdir}/kde3/libkwordpart.* %{_libdir}/kde3/kword.* %{_datadir}/apps/kword @@ -562,8 +557,8 @@ %files kspread %defattr(-,root,root,-) %{_bindir}/kspread -%{_libdir}/libkdeinit_kspread.* -%{_libdir}/libkspreadcommon.* +%{_libdir}/libkdeinit_kspread.so +%{_libdir}/libkspreadcommon.so.* %{_libdir}/kde3/kspread.* %{_libdir}/kde3/libkspreadpart.* %{_libdir}/kde3/kwmailmerge_kspread.* @@ -587,9 +582,9 @@ %defattr(-,root,root,-) %{_bindir}/kpresenter %{_bindir}/kprconverter.pl -%{_libdir}/libkdeinit_kpresenter.* -%{_libdir}/libkpresenterimageexport.* -%{_libdir}/libkpresenterprivate.* +%{_libdir}/libkdeinit_kpresenter.so +%{_libdir}/libkpresenterimageexport.so.* +%{_libdir}/libkpresenterprivate.so.* %{_libdir}/kde3/libkpresenterpart.* %{_libdir}/kde3/kformula.* %{_libdir}/kde3/kpresenter.* @@ -610,8 +605,8 @@ %files karbon %defattr(-,root,root,-) %{_bindir}/karbon -%{_libdir}/libkdeinit_karbon.* -%{_libdir}/libkarboncommon.* +%{_libdir}/libkdeinit_karbon.so +%{_libdir}/libkarboncommon.so.* %{_libdir}/kde3/karbon_defaulttools.* %{_libdir}/kde3/karbon_flattenpathplugin.* %{_libdir}/kde3/karbon_imagetoolplugin.* @@ -642,20 +637,20 @@ %files krita %defattr(-,root,root,-) %{_bindir}/krita -%{_libdir}/libkdeinit_krita.* -%{_libdir}/libkrita_cmyk_u16.* -%{_libdir}/libkrita_gray_u16.* -%{_libdir}/libkrita_lms_f32.* -%{_libdir}/libkrita_rgb_f16half.* -%{_libdir}/libkrita_rgb_f32.* -%{_libdir}/libkrita_rgb_u16.* -%{_libdir}/libkritacolor.* -%{_libdir}/libkritagrayscale.* -%{_libdir}/libkritaimage.* -%{_libdir}/libkritargb.* -%{_libdir}/libkritascripting.* -%{_libdir}/libkritaui.* -%{_libdir}/libkritacommon.* +%{_libdir}/libkdeinit_krita.so +%{_libdir}/libkrita_cmyk_u16.so.* +%{_libdir}/libkrita_gray_u16.so.* +%{_libdir}/libkrita_lms_f32.so.* +%{_libdir}/libkrita_rgb_f16half.so.* +%{_libdir}/libkrita_rgb_f32.so.* +%{_libdir}/libkrita_rgb_u16.so.* +%{_libdir}/libkritacolor.so.* +%{_libdir}/libkritagrayscale.so.* +%{_libdir}/libkritaimage.so.* +%{_libdir}/libkritargb.so.* +%{_libdir}/libkritascripting.so.* +%{_libdir}/libkritaui.so.* +%{_libdir}/libkritacommon.so.* %{_libdir}/kde3/kritacimg.* %{_libdir}/kde3/kritacolorrange.* %{_libdir}/kde3/kritacolorsfilters.* @@ -728,10 +723,10 @@ %defattr(-,root,root,-) %{_bindir}/kugar %{_bindir}/kudesigner -%{_libdir}/libkdeinit_kugar.* -%{_libdir}/libkdeinit_kudesigner.* -%{_libdir}/libkugarlib.* -%{_libdir}/libkudesignercore.* +%{_libdir}/libkdeinit_kugar.so +%{_libdir}/libkdeinit_kudesigner.so +%{_libdir}/libkugarlib.so.* +%{_libdir}/libkudesignercore.so %{_libdir}/kde3/kudesigner.* %{_libdir}/kde3/kugar.* %{_libdir}/kde3/libkudesignerpart.* @@ -747,21 +742,24 @@ %defattr(-,root,root,-) %{_bindir}/kexi %{_bindir}/ksqlite* -%{_libdir}/libkdeinit_kexi.* -%{_libdir}/libkexicore.* -%{_libdir}/libkexidatatable.* -%{_libdir}/libkexidbparser.* -%{_libdir}/libkexidb.* -%{_libdir}/libkexiextendedwidgets.* -%{_libdir}/libkexiformutils.* -%{_libdir}/libkexiguiutils.* -%{_libdir}/libkeximain.* -%{_libdir}/libkeximigrate.* -%{_libdir}/libkexirelationsview.* -%{_libdir}/libkexisql2.* -%{_libdir}/libkexisql3.* -%{_libdir}/libkformdesigner.* -%{_libdir}/libkexiutils.* +%{_libdir}/libkdeinit_kexi.so +%{_libdir}/libkexicore.so.* +%{_libdir}/libkexidatatable.so.* +%{_libdir}/libkexidbparser.so.* +%{_libdir}/libkexidb.so.* +%{_libdir}/libkexiextendedwidgets.so.* +%{_libdir}/libkexiformutils.so.* +%{_libdir}/libkexiguiutils.so.* +%{_libdir}/libkeximain.so.* +%{_libdir}/libkeximigrate.so.* +%{_libdir}/libkexirelationsview.so.* +%{_libdir}/libkexisql2.so.* +%{_libdir}/libkexisql3.so.* +%{_libdir}/libkformdesigner.so.* +%{_libdir}/libkexiutils.so.* +%{_libdir}/libkexireportutils.so.* +%{_libdir}/kde3/kexihandler_report.* +%{_libdir}/kde3/kexireportwidgets.* %{_libdir}/kde3/kformdesigner_containers.* %{_libdir}/kde3/kformdesigner_kexidbwidgets.* %{_libdir}/kde3/kformdesigner_stdwidgets.* @@ -784,8 +782,8 @@ %{_libdir}/kde3/krosskritacore.* %{_libdir}/kde3/krosspython.* #%{_libdir}/kde3/krossruby.* -%{_libdir}/libkrossapi.* -%{_libdir}/libkrossmain.* +%{_libdir}/libkrossapi.so.* +%{_libdir}/libkrossmain.so.* %{_datadir}/config/kexirc %{_datadir}/config/magic/kexi.magic %{_datadir}/mimelnk/application/* @@ -803,9 +801,9 @@ %files kchart %defattr(-,root,root,-) %{_bindir}/kchart -%{_libdir}/libkchartcommon.* -%{_libdir}/libkdeinit_kchart.* -%{_libdir}/libkchartimageexport.* +%{_libdir}/libkchartcommon.so.* +%{_libdir}/libkdeinit_kchart.so +%{_libdir}/libkchartimageexport.so.* %{_libdir}/kde3/kchart.* %{_libdir}/kde3/libkchartpart.* %{_libdir}/kde3/libkchartpngexport.* @@ -833,8 +831,8 @@ %files kivio %defattr(-,root,root,-) %{_bindir}/kivio -%{_libdir}/libkdeinit_kivio.* -%{_libdir}/libkiviocommon.* +%{_libdir}/libkdeinit_kivio.so +%{_libdir}/libkiviocommon.so.* %{_libdir}/kde3/kivio.* %{_libdir}/kde3/libkiviopart.* %{_libdir}/kde3/straight_connector.* @@ -852,7 +850,7 @@ %files filters %defattr(-,root,root,-) -%{_libdir}/libkwordexportfilters.* +%{_libdir}/libkwordexportfilters.so.* %{_libdir}/kde3/libabiwordexport.* %{_libdir}/kde3/libabiwordimport.* %{_libdir}/kde3/libamiproexport.* @@ -906,7 +904,7 @@ %files kplato %defattr(-,root,root,-) %{_bindir}/kplato -%{_libdir}/libkdeinit_kplato.* +%{_libdir}/libkdeinit_kplato.so %{_libdir}/kde3/kplato.* %{_libdir}/kde3/libkplatopart.* %{_datadir}/apps/kplato @@ -918,6 +916,8 @@ * Wed Feb 01 2006 Andreas Bierfert 1.4.90-1 - version upgrade +- better split libdir/*.so -> -devel, libdir/*.so.* -> packages + libdir/*.la -> trash; libdir/.* -> packages * Thu Dec 08 2005 Andreas Bierfert 1.4.2-3 From fedora-extras-commits at redhat.com Sat Feb 4 02:23:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Feb 2006 21:23:07 -0500 Subject: owners owners.list,1.604,1.605 Message-ID: <200602040223.k142NdAt010892@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10875 Modified Files: owners.list Log Message: Adding cpanspec. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.604 retrieving revision 1.605 diff -u -r1.604 -r1.605 --- owners.list 3 Feb 2006 22:19:53 -0000 1.604 +++ owners.list 4 Feb 2006 02:23:06 -0000 1.605 @@ -134,6 +134,7 @@ Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|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| 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| From fedora-extras-commits at redhat.com Sat Feb 4 05:44:29 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 00:44:29 -0500 Subject: rpms/numpy - New directory Message-ID: <200602040544.k145iVtC017223@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/numpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17215/numpy Log Message: Directory /cvs/extras/rpms/numpy added to the repository From fedora-extras-commits at redhat.com Sat Feb 4 05:44:35 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 00:44:35 -0500 Subject: rpms/numpy/devel - New directory Message-ID: <200602040544.k145ibrq017238@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/numpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17215/numpy/devel Log Message: Directory /cvs/extras/rpms/numpy/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 4 05:44:55 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 00:44:55 -0500 Subject: rpms/numpy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602040544.k145ivdl017272@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/numpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17260 Added Files: Makefile import.log Log Message: Setup of module numpy --- NEW FILE Makefile --- # Top level Makefile for module numpy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 4 05:45:01 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 00:45:01 -0500 Subject: rpms/numpy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602040545.k145j3f5017294@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/numpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17260/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module numpy --- NEW 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 Feb 4 05:46:35 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 00:46:35 -0500 Subject: rpms/numpy import.log,1.1,1.2 Message-ID: <200602040547.k145l7Mb017383@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/numpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17343 Modified Files: import.log Log Message: auto-import numpy-0.9.4-1 on branch devel from numpy-0.9.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/numpy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Feb 2006 05:44:55 -0000 1.1 +++ import.log 4 Feb 2006 05:46:35 -0000 1.2 @@ -0,0 +1 @@ +numpy-0_9_4-1_fc5:HEAD:numpy-0.9.4-1.src.rpm:1139031988 From fedora-extras-commits at redhat.com Sat Feb 4 05:46:41 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 00:46:41 -0500 Subject: rpms/numpy/devel numpy-0.9.4-f2pynumpy.patch, NONE, 1.1 numpy-0.9.4-gfortran.patch, NONE, 1.1 numpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602040547.k145lDsk017387@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/numpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17343/devel Modified Files: .cvsignore sources Added Files: numpy-0.9.4-f2pynumpy.patch numpy-0.9.4-gfortran.patch numpy.spec Log Message: auto-import numpy-0.9.4-1 on branch devel from numpy-0.9.4-1.src.rpm numpy-0.9.4-f2pynumpy.patch: --- NEW FILE numpy-0.9.4-f2pynumpy.patch --- --- numpy-0.9.2/numpy/f2py/f2py.1.f2pynumpy 2006-01-19 23:07:33.000000000 -0500 +++ numpy-0.9.2/numpy/f2py/f2py.1 2006-01-19 23:10:00.000000000 -0500 @@ -1,20 +1,20 @@ -.TH "F2PY" 1 +.TH "F2PY.NUMPY" 1 .SH NAME -f2py \- Fortran to Python interface generator +f2py.numpy \- Fortran to Python interface generator .SH SYNOPSIS (1) To construct extension module sources: -.B f2py +.B f2py.numpy [] [[[only:]||[skip:]] ] [: ...] (2) To compile fortran files and build extension modules: -.B f2py +.B f2py.numpy -c [, , ] (3) To generate signature files: -.B f2py +.B f2py.numpy -h ...< same options as in (1) > .SH DESCRIPTION This program generates a Python C/API file (module.c) @@ -44,7 +44,7 @@ Get back to mode. .TP .B \-m -Name of the module; f2py generates a Python/C API file +Name of the module; f2py.numpy generates a Python/C API file module.c or extension module . Default is \'untitled\'. .TP @@ -53,7 +53,7 @@ assumed with -h key, and --no-lower without -h key. .TP .B \-\-build\-dir -All f2py generated files are created in . Default is tempfile.mktemp(). +All f2py.numpy generated files are created in . Default is tempfile.mktemp(). .TP .B \-\-overwrite\-signature Overwrite existing signature file. @@ -95,10 +95,10 @@ Run with extra verbosity. .TP .B \-v -Print f2py version ID and exit. +Print f2py.numpy version ID and exit. .TP .B \-\-include_paths path1:path2:... -Search include files (that f2py will scan) from the given directories. +Search include files (that f2py.numpy will scan) from the given directories. .SH "CONFIG_FC OPTIONS" The following options are effective only when -c switch is used. .TP @@ -180,11 +180,7 @@ .SH REQUIREMENTS Python 1.5.2 or higher (2.x is supported). -Numerical Python 13 or higher (20.x,21.x,22.x,23.x are supported). - -Optional Numarray 0.9 or higher partially supported. - -numpy_distutils from Scipy (can be downloaded from F2PY homepage) +numpy_distutils from Numpy .SH "SEE ALSO" python(1) .SH BUGS @@ -200,10 +196,8 @@ Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/ -Scipy website: http://www.numpy.org +Numpy website: http://numeric.scipy.org/ .SH COPYRIGHT Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson .SH LICENSE NumPy License -.SH VERSION -2.45.241 numpy-0.9.4-gfortran.patch: --- NEW FILE numpy-0.9.4-gfortran.patch --- --- numpy-0.9.4/numpy/distutils/fcompiler/gnu.py.orig 2006-02-01 14:01:20.000000000 -0500 +++ numpy-0.9.4/numpy/distutils/fcompiler/gnu.py 2006-02-01 17:28:33.000000000 -0500 @@ -29,7 +29,7 @@ 'compiler_f77' : [fc_exe,"-Wall","-fno-second-underscore"], 'compiler_f90' : None, 'compiler_fix' : None, - 'linker_so' : [fc_exe,"-Wall"], + 'linker_so' : [fc_exe,"-shared", "-Wall"], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"], 'linker_exe' : [fc_exe,"-Wall"] @@ -211,7 +211,8 @@ class Gnu95FCompiler(GnuFCompiler): compiler_type = 'gnu95' - version_pattern = r'GNU Fortran 95 \(GCC (?P[^\s*\)]+)' +# version_pattern = r'GNU Fortran 95 \(GCC (?P[^\s*\)]+)' + version_pattern = r'GNU Fortran 95 \(GCC\)?\s*(?P[0-9.]+)' # 'gfortran --version' results: # Debian: GNU Fortran 95 (GCC 4.0.3 20051023 (prerelease) (Debian 4.0.2-3)) @@ -224,6 +225,6 @@ 'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"], 'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"], 'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"], - 'linker_so' : [fc_exe,"-Wall"], + 'linker_so' : [fc_exe,"-shared", "-Wall"], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"], 'linker_exe' : [fc_exe,"-Wall"] --- NEW FILE numpy.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: numpy Version: 0.9.4 Release: 1%{?dist} Summary: A fast multidimensional array facility for Python Group: Development/Languages License: BSD URL: http://numeric.scipy.org/ Source0: http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz Patch: numpy-0.9.4-f2pynumpy.patch Patch1: numpy-0.9.4-gfortran.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description The Numeric Python extensions is a set of extensions to the Python programming language which allows Python programmers to efficiently manipulate large sets of objects organized in grid-like fashion. These sets of objects are called arrays, and they can have any number of dimensions: one dimensional arrays are similar to standard Python sequences, two-dimensional arrays are similar to matrices from linear algebra. Note that one-dimensional arrays are also different from any other Python sequence, and that two-dimensional matrices are also different from the matrices of linear algebra. This package also contains a version of f2py that works properly with it. %prep %setup -q %patch -p1 -b .f2pynumpy %patch1 -p1 -b .gfortran %build BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1 rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc . install -D -p -m 0644 f2py.1 $RPM_BUILD_ROOT%{_mandir}/man1/f2py.numpy.1 pushd $RPM_BUILD_ROOT%{_bindir} &> /dev/null mv -f f2py f2py.numpy popd &> /dev/null %check ||: pushd doc &> /dev/null PYTHONPATH="$RPM_BUILD_ROOT%{python_sitearch}" %{__python} -c "import pkg_resources, numpy ; numpy.test(1, 1)" popd &> /dev/null %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc docs-f2py doc/* LICENSE.txt %{_bindir}/* %{_mandir}/man*/* %{python_sitearch}/%{name} %changelog * Thu Feb 2 2006 Ignacio Vazquez-Abrams 0.9.4-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/numpy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Feb 2006 05:45:00 -0000 1.1 +++ .cvsignore 4 Feb 2006 05:46:41 -0000 1.2 @@ -0,0 +1 @@ +numpy-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/numpy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Feb 2006 05:45:00 -0000 1.1 +++ sources 4 Feb 2006 05:46:41 -0000 1.2 @@ -0,0 +1 @@ +104ef1beb4b0182be52e2c0849305427 numpy-0.9.4.tar.gz From fedora-extras-commits at redhat.com Sat Feb 4 05:57:59 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 00:57:59 -0500 Subject: owners owners.list,1.605,1.606 Message-ID: <200602040558.k145wWJB017497@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17473 Modified Files: owners.list Log Message: numpy Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.605 retrieving revision 1.606 diff -u -r1.605 -r1.606 --- owners.list 4 Feb 2006 02:23:06 -0000 1.605 +++ owners.list 4 Feb 2006 05:57:59 -0000 1.606 @@ -690,6 +690,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|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| Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|obby|A library which provides synced document buffers|lmacken at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Feb 4 09:13:12 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 04:13:12 -0500 Subject: rpms/notecase/devel notecase-1.1.4-wwtt.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 notecase.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200602040913.k149Dj9t025554@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25510/devel Modified Files: .cvsignore notecase.spec sources Added Files: notecase-1.1.4-wwtt.patch Log Message: Upstream update notecase-1.1.4-wwtt.patch: --- NEW FILE notecase-1.1.4-wwtt.patch --- --- notecase-1.1.4/src/LinkPropertiesDlg.h.wwtt 2005-10-06 13:40:56.000000000 -0400 +++ notecase-1.1.4/src/LinkPropertiesDlg.h 2006-02-03 23:09:49.000000000 -0500 @@ -28,7 +28,7 @@ LinkInfo m_info; protected: - GtkWidget* LinkPropertiesDlg::create_link_wizard (); + GtkWidget* create_link_wizard (); }; #endif // LINKPROPERTIESDLG_H__ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/notecase/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Oct 2005 06:34:16 -0000 1.5 +++ .cvsignore 4 Feb 2006 09:13:12 -0000 1.6 @@ -1 +1 @@ -notecase-1.1.2_src.zip +notecase-1.1.4_src.zip Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- notecase.spec 31 Oct 2005 06:39:21 -0000 1.14 +++ notecase.spec 4 Feb 2006 09:13:12 -0000 1.15 @@ -1,5 +1,5 @@ Name: notecase -Version: 1.1.2 +Version: 1.1.4 Release: 1%{?dist} Summary: A hierarchical note manager @@ -8,6 +8,7 @@ URL: http://notecase.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip Patch: notecase-1.1.2-buildfix.patch +Patch1: notecase-1.1.4-wwtt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext gnome-vfs2-devel @@ -24,6 +25,7 @@ %prep %setup -q %patch -p1 -b .buildfix +%patch1 -p1 -b .wwtt find docs -type f -exec sed -i -e 's/\r//g' \{\} \; find src -type f -exec sed -i -e 's/\r//g' \{\} \; sed -i -e 's/\r//g' readme.txt @@ -68,6 +70,9 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat Feb 4 2006 Ignacio Vazquez-Abrams 1.1.4-1 +- Upstream update + * Sun Oct 30 2005 Ignacio Vazquez-Abrams 1.1.2-1 - Upstream update - Fix -debuginfo subpackage (#170970) Index: sources =================================================================== RCS file: /cvs/extras/rpms/notecase/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Oct 2005 06:34:16 -0000 1.5 +++ sources 4 Feb 2006 09:13:12 -0000 1.6 @@ -1 +1 @@ -e3460f3906e9740577fa8058d7d9b67d notecase-1.1.2_src.zip +e217ca27089518d08922d2b93a967441 notecase-1.1.4_src.zip From fedora-extras-commits at redhat.com Sat Feb 4 09:12:39 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 04:12:39 -0500 Subject: rpms/notecase/FC-4 notecase-1.1.4-wwtt.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 notecase.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200602040914.k149EAB9025559@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25510/FC-4 Modified Files: .cvsignore notecase.spec sources Added Files: notecase-1.1.4-wwtt.patch Log Message: Upstream update notecase-1.1.4-wwtt.patch: --- NEW FILE notecase-1.1.4-wwtt.patch --- --- notecase-1.1.4/src/LinkPropertiesDlg.h.wwtt 2005-10-06 13:40:56.000000000 -0400 +++ notecase-1.1.4/src/LinkPropertiesDlg.h 2006-02-03 23:09:49.000000000 -0500 @@ -28,7 +28,7 @@ LinkInfo m_info; protected: - GtkWidget* LinkPropertiesDlg::create_link_wizard (); + GtkWidget* create_link_wizard (); }; #endif // LINKPROPERTIESDLG_H__ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Oct 2005 06:34:10 -0000 1.5 +++ .cvsignore 4 Feb 2006 09:12:37 -0000 1.6 @@ -1 +1 @@ -notecase-1.1.2_src.zip +notecase-1.1.4_src.zip Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-4/notecase.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- notecase.spec 31 Oct 2005 06:37:25 -0000 1.14 +++ notecase.spec 4 Feb 2006 09:12:37 -0000 1.15 @@ -1,5 +1,5 @@ Name: notecase -Version: 1.1.2 +Version: 1.1.4 Release: 1%{?dist} Summary: A hierarchical note manager @@ -8,6 +8,7 @@ URL: http://notecase.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip Patch: notecase-1.1.2-buildfix.patch +Patch1: notecase-1.1.4-wwtt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.4 desktop-file-utils gettext gnome-vfs2-devel @@ -24,6 +25,7 @@ %prep %setup -q %patch -p1 -b .buildfix +%patch1 -p1 -b .wwtt find docs -type f -exec sed -i -e 's/\r//g' \{\} \; find src -type f -exec sed -i -e 's/\r//g' \{\} \; sed -i -e 's/\r//g' readme.txt @@ -68,6 +70,9 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat Feb 4 2006 Ignacio Vazquez-Abrams 1.1.4-1 +- Upstream update + * Sun Oct 30 2005 Ignacio Vazquez-Abrams 1.1.2-1 - Upstream update - Fix -debuginfo subpackage (#170970) Index: sources =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Oct 2005 06:34:10 -0000 1.5 +++ sources 4 Feb 2006 09:12:37 -0000 1.6 @@ -1 +1 @@ -e3460f3906e9740577fa8058d7d9b67d notecase-1.1.2_src.zip +e217ca27089518d08922d2b93a967441 notecase-1.1.4_src.zip From fedora-extras-commits at redhat.com Sat Feb 4 13:00:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 08:00:58 -0500 Subject: rpms/openal/FC-4 .cvsignore, 1.4, 1.5 openal-pkgconfig.patch, 1.1, 1.2 openal.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200602041301.k14D1VYa000913@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31544/FC-4 Modified Files: .cvsignore openal-pkgconfig.patch openal.spec sources Log Message: - upgrade to current cvs (as proposed by upstream) - fix pkg-config output for now (might be missing Requires) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openal/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jan 2006 08:43:31 -0000 1.4 +++ .cvsignore 4 Feb 2006 13:00:58 -0000 1.5 @@ -1 +1 @@ -openal-0.0.8.tar.gz +openal-cvs-20060204.tar.bz2 openal-pkgconfig.patch: Index: openal-pkgconfig.patch =================================================================== RCS file: /cvs/extras/rpms/openal/FC-4/openal-pkgconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openal-pkgconfig.patch 30 Jan 2006 22:47:20 -0000 1.1 +++ openal-pkgconfig.patch 4 Feb 2006 13:00:58 -0000 1.2 @@ -1,18 +1,11 @@ ---- admin/pkgconfig/Makefile.am.orig 2006-01-30 23:41:34.000000000 +0100 -+++ admin/pkgconfig/Makefile.am 2006-01-30 23:41:44.000000000 +0100 -@@ -1,3 +1,3 @@ --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = openal.pc - bin_SCRIPTS = openal-config ---- admin/pkgconfig/Makefile.in.orig 2006-01-30 23:45:01.000000000 +0100 -+++ admin/pkgconfig/Makefile.in 2006-01-30 23:45:42.000000000 +0100 -@@ -192,7 +192,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = openal.pc - bin_SCRIPTS = openal-config - all: all-am +--- admin/pkgconfig/openal.pc.in.orig 2006-02-04 13:11:55.000000000 +0100 ++++ admin/pkgconfig/openal.pc.in 2006-02-04 13:12:14.000000000 +0100 +@@ -5,7 +5,7 @@ + + Name: OpenAL + Description: OpenAL is a cross-platform 3D audio API. +-Requires: @requirements@ ++Requires: + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lopenal + Cflags: -I${includedir} Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- openal.spec 30 Jan 2006 22:47:20 -0000 1.13 +++ openal.spec 4 Feb 2006 13:00:58 -0000 1.14 @@ -1,12 +1,16 @@ Name: openal -Version: 0.0.8 -Release: 2%{?dist} +Version: 0.0.9 +Release: 0.1.20060204%{?dist} Summary: Open Audio Library Group: System Environment/Libraries License: LGPL URL: http://www.openal.org/ -Source0: http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz +# source from cvs +#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login +#(use password "guest") +#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository co MODULE +Source0: openal-cvs-20060204.tar.bz2 Source1: openalrc Patch0: openal-arch.patch Patch1: openal-pkgconfig.patch @@ -22,6 +26,7 @@ BuildRequires: SDL-devel BuildRequires: texinfo Obsoletes: %{name}-test < 0.0.8 +BuildRequires: autoconf %description OpenAL is an audio library designed in the spirit of OpenGL--machine @@ -44,7 +49,8 @@ %prep -%setup -q +%setup -q -n portable +./autogen.sh %patch0 -p1 %patch1 @@ -56,8 +62,8 @@ --enable-sdl \ --disable-smpeg \ --enable-capture -# drop smpflags do not work -make + +make %{?_smp_mflags} %install Index: sources =================================================================== RCS file: /cvs/extras/rpms/openal/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jan 2006 08:43:31 -0000 1.4 +++ sources 4 Feb 2006 13:00:58 -0000 1.5 @@ -1 +1 @@ -0379bd39fc84454491ef38434a2e6e8d openal-0.0.8.tar.gz +bce099b3f19125bb31f9d4363149e773 openal-cvs-20060204.tar.bz2 From fedora-extras-commits at redhat.com Sat Feb 4 13:00:52 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 08:00:52 -0500 Subject: rpms/openal/FC-3 .cvsignore, 1.4, 1.5 openal-pkgconfig.patch, 1.1, 1.2 openal.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200602041301.k14D1QOW000904@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31544/FC-3 Modified Files: .cvsignore openal-pkgconfig.patch openal.spec sources Log Message: - upgrade to current cvs (as proposed by upstream) - fix pkg-config output for now (might be missing Requires) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openal/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jan 2006 08:43:25 -0000 1.4 +++ .cvsignore 4 Feb 2006 13:00:52 -0000 1.5 @@ -1 +1 @@ -openal-0.0.8.tar.gz +openal-cvs-20060204.tar.bz2 openal-pkgconfig.patch: Index: openal-pkgconfig.patch =================================================================== RCS file: /cvs/extras/rpms/openal/FC-3/openal-pkgconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openal-pkgconfig.patch 30 Jan 2006 23:05:24 -0000 1.1 +++ openal-pkgconfig.patch 4 Feb 2006 13:00:52 -0000 1.2 @@ -1,18 +1,11 @@ ---- admin/pkgconfig/Makefile.am.orig 2006-01-30 23:41:34.000000000 +0100 -+++ admin/pkgconfig/Makefile.am 2006-01-30 23:41:44.000000000 +0100 -@@ -1,3 +1,3 @@ --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = openal.pc - bin_SCRIPTS = openal-config ---- admin/pkgconfig/Makefile.in.orig 2006-01-30 23:45:01.000000000 +0100 -+++ admin/pkgconfig/Makefile.in 2006-01-30 23:45:42.000000000 +0100 -@@ -192,7 +192,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = openal.pc - bin_SCRIPTS = openal-config - all: all-am +--- admin/pkgconfig/openal.pc.in.orig 2006-02-04 13:11:55.000000000 +0100 ++++ admin/pkgconfig/openal.pc.in 2006-02-04 13:12:14.000000000 +0100 +@@ -5,7 +5,7 @@ + + Name: OpenAL + Description: OpenAL is a cross-platform 3D audio API. +-Requires: @requirements@ ++Requires: + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lopenal + Cflags: -I${includedir} Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/FC-3/openal.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openal.spec 30 Jan 2006 23:05:24 -0000 1.8 +++ openal.spec 4 Feb 2006 13:00:52 -0000 1.9 @@ -1,12 +1,16 @@ Name: openal -Version: 0.0.8 -Release: 2%{?dist} +Version: 0.0.9 +Release: 0.1.20060204%{?dist} Summary: Open Audio Library Group: System Environment/Libraries License: LGPL URL: http://www.openal.org/ -Source0: http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz +# source from cvs +#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login +#(use password "guest") +#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository co MODULE +Source0: openal-cvs-20060204.tar.bz2 Source1: openalrc Patch0: openal-arch.patch Patch1: openal-pkgconfig.patch @@ -22,6 +26,7 @@ BuildRequires: SDL-devel BuildRequires: texinfo Obsoletes: %{name}-test < 0.0.8 +BuildRequires: autoconf %description OpenAL is an audio library designed in the spirit of OpenGL--machine @@ -44,7 +49,8 @@ %prep -%setup -q +%setup -q -n portable +./autogen.sh %patch0 -p1 %patch1 @@ -56,6 +62,7 @@ --enable-sdl \ --disable-smpeg \ --enable-capture + make %{?_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/openal/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jan 2006 08:43:25 -0000 1.4 +++ sources 4 Feb 2006 13:00:52 -0000 1.5 @@ -1 +1 @@ -0379bd39fc84454491ef38434a2e6e8d openal-0.0.8.tar.gz +bce099b3f19125bb31f9d4363149e773 openal-cvs-20060204.tar.bz2 From fedora-extras-commits at redhat.com Sat Feb 4 13:01:04 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 08:01:04 -0500 Subject: rpms/openal/devel .cvsignore, 1.5, 1.6 openal-pkgconfig.patch, 1.1, 1.2 openal.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200602041301.k14D1bdn000922@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31544/devel Modified Files: .cvsignore openal-pkgconfig.patch openal.spec sources Log Message: - upgrade to current cvs (as proposed by upstream) - fix pkg-config output for now (might be missing Requires) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openal/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Jan 2006 08:43:37 -0000 1.5 +++ .cvsignore 4 Feb 2006 13:01:04 -0000 1.6 @@ -1 +1 @@ -openal-0.0.8.tar.gz +openal-cvs-20060204.tar.bz2 openal-pkgconfig.patch: Index: openal-pkgconfig.patch =================================================================== RCS file: /cvs/extras/rpms/openal/devel/openal-pkgconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openal-pkgconfig.patch 30 Jan 2006 23:05:31 -0000 1.1 +++ openal-pkgconfig.patch 4 Feb 2006 13:01:04 -0000 1.2 @@ -1,18 +1,11 @@ ---- admin/pkgconfig/Makefile.am.orig 2006-01-30 23:41:34.000000000 +0100 -+++ admin/pkgconfig/Makefile.am 2006-01-30 23:41:44.000000000 +0100 -@@ -1,3 +1,3 @@ --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = openal.pc - bin_SCRIPTS = openal-config ---- admin/pkgconfig/Makefile.in.orig 2006-01-30 23:45:01.000000000 +0100 -+++ admin/pkgconfig/Makefile.in 2006-01-30 23:45:42.000000000 +0100 -@@ -192,7 +192,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = openal.pc - bin_SCRIPTS = openal-config - all: all-am +--- admin/pkgconfig/openal.pc.in.orig 2006-02-04 13:11:55.000000000 +0100 ++++ admin/pkgconfig/openal.pc.in 2006-02-04 13:12:14.000000000 +0100 +@@ -5,7 +5,7 @@ + + Name: OpenAL + Description: OpenAL is a cross-platform 3D audio API. +-Requires: @requirements@ ++Requires: + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lopenal + Cflags: -I${includedir} Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openal.spec 30 Jan 2006 23:05:31 -0000 1.12 +++ openal.spec 4 Feb 2006 13:01:04 -0000 1.13 @@ -1,12 +1,16 @@ Name: openal -Version: 0.0.8 -Release: 2%{?dist} +Version: 0.0.9 +Release: 0.1.20060204%{?dist} Summary: Open Audio Library Group: System Environment/Libraries License: LGPL URL: http://www.openal.org/ -Source0: http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz +# source from cvs +#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login +#(use password "guest") +#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository co MODULE +Source0: openal-cvs-20060204.tar.bz2 Source1: openalrc Patch0: openal-arch.patch Patch1: openal-pkgconfig.patch @@ -22,6 +26,7 @@ BuildRequires: SDL-devel BuildRequires: texinfo Obsoletes: %{name}-test < 0.0.8 +BuildRequires: autoconf %description OpenAL is an audio library designed in the spirit of OpenGL--machine @@ -44,7 +49,8 @@ %prep -%setup -q +%setup -q -n portable +./autogen.sh %patch0 -p1 %patch1 @@ -56,6 +62,7 @@ --enable-sdl \ --disable-smpeg \ --enable-capture + make %{?_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/openal/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Jan 2006 08:43:37 -0000 1.5 +++ sources 4 Feb 2006 13:01:04 -0000 1.6 @@ -1 +1 @@ -0379bd39fc84454491ef38434a2e6e8d openal-0.0.8.tar.gz +bce099b3f19125bb31f9d4363149e773 openal-cvs-20060204.tar.bz2 From fedora-extras-commits at redhat.com Sat Feb 4 13:19:27 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 4 Feb 2006 08:19:27 -0500 Subject: rpms/azureus/devel azureus.spec,1.10,1.11 azureus.script,1.4,1.5 Message-ID: <200602041319.k14DJxEJ001224@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1205 Modified Files: azureus.spec azureus.script Log Message: Release -22. Update swt library requirements to match latest eclipse. Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- azureus.spec 28 Jan 2006 21:35:57 -0000 1.10 +++ azureus.spec 4 Feb 2006 13:19:26 -0000 1.11 @@ -1,6 +1,6 @@ Name: azureus Version: 2.3.0.6 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -35,8 +35,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis -BuildRequires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto, libgtk-java, glib-java -Requires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto, libgtk-java, glib-java +BuildRequires: jakarta-commons-cli, libswt3-gtk2-3.1.2, log4j, gnu-crypto, libgtk-java, glib-java +Requires: jakarta-commons-cli, libswt3-gtk2-3.1.2, log4j, gnu-crypto, libgtk-java, glib-java Requires: libgcj >= 4.1.0-0.15 BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -72,7 +72,7 @@ %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 +build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.2 log4j gnu-crypto gtk2.8 glib0.2 find ./ -name osx | xargs rm -r find ./ -name macosx | xargs rm -r find ./ -name [Ww]in32\* | xargs rm -r @@ -150,6 +150,9 @@ %{_libdir}/gcj/* %changelog +* Sat Feb 4 2006 Anthony Green - 2.3.0.6-22 +- Update libswt3-gtk2 requirements in spec file and azureus.script. + * Fri Jan 27 2006 Anthony Green - 2.3.0.6-21 - Add azureus-no-shared-plugins.patch. - Add azureus-no-shared-plugins2.patch. Index: azureus.script =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- azureus.script 27 Jan 2006 15:02:12 -0000 1.4 +++ azureus.script 4 Feb 2006 13:19:26 -0000 1.5 @@ -1,3 +1,3 @@ #!/bin/sh -CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@" +CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.2 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@" From fedora-extras-commits at redhat.com Sat Feb 4 13:32:53 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 4 Feb 2006 08:32:53 -0500 Subject: rpms/azureus/devel azureus.spec,1.11,1.12 Message-ID: <200602041333.k14DXP8L001315@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1296 Modified Files: azureus.spec Log Message: Fix mistake in last spec change. Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- azureus.spec 4 Feb 2006 13:19:26 -0000 1.11 +++ azureus.spec 4 Feb 2006 13:32:53 -0000 1.12 @@ -1,6 +1,6 @@ Name: azureus Version: 2.3.0.6 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -35,8 +35,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis -BuildRequires: jakarta-commons-cli, libswt3-gtk2-3.1.2, log4j, gnu-crypto, libgtk-java, glib-java -Requires: jakarta-commons-cli, libswt3-gtk2-3.1.2, log4j, gnu-crypto, libgtk-java, glib-java +BuildRequires: jakarta-commons-cli, libswt3-gtk2 >= 3.1.2, log4j, gnu-crypto, libgtk-java, glib-java +Requires: jakarta-commons-cli, libswt3-gtk2 >= 3.1.2, log4j, gnu-crypto, libgtk-java, glib-java Requires: libgcj >= 4.1.0-0.15 BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 @@ -150,6 +150,9 @@ %{_libdir}/gcj/* %changelog +* Sat Feb 4 2006 Anthony Green - 2.3.0.6-23 +- Fix thinko in last revision. + * Sat Feb 4 2006 Anthony Green - 2.3.0.6-22 - Update libswt3-gtk2 requirements in spec file and azureus.script. From fedora-extras-commits at redhat.com Sat Feb 4 13:37:54 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 4 Feb 2006 08:37:54 -0500 Subject: rpms/rssowl/devel rssowl.spec,1.1,1.2 rssowl.script,1.1,1.2 Message-ID: <200602041338.k14DcQQe001386@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1367 Modified Files: rssowl.spec rssowl.script Log Message: Update to -8 release. Update eclipse dependencies. Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl.spec 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl.spec 4 Feb 2006 13:37:54 -0000 1.2 @@ -1,6 +1,6 @@ %define name rssowl %define version 1.2 -%define release 7%{?dist} +%define release 8%{?dist} %define jdk java Name: %name @@ -24,7 +24,7 @@ Requires: jre >= 1.4.2- BuildRequires: java-sdk >= 1.4.2 BuildRequires: ImageMagick -BuildRequires: ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform +BuildRequires: ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.1.2 BuildRequires: libgconf-java BuildRequires: ant, jpackage-utils >= 1.5 BuildRequires: dos2unix @@ -61,7 +61,7 @@ rm doc/mpl-v11.txt %build -build-jar-repository lib swt-gtk-3.1.1 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 +build-jar-repository lib swt-gtk-3.1.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar lib ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar lib cd src @@ -121,6 +121,10 @@ %{_libdir}/gcj/%{name} %changelog +* Sat Feb 4 2006 Anthony Green - 1.2-8 +- Update eclipse-platform requirement in spec file and eclipse swt and + runtime references in rssowl.script. + * Mon Jan 16 2006 Anthony Green 1.2-7 - Word-wrapped descriptions. - Set Group to Applications/Internet. Index: rssowl.script =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl.script 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl.script 4 Feb 2006 13:37:54 -0000 1.2 @@ -10,4 +10,4 @@ fi export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME -exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.1.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@" +exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@" From fedora-extras-commits at redhat.com Sat Feb 4 13:47:58 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sat, 4 Feb 2006 08:47:58 -0500 Subject: rpms/translate-toolkit/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 translate-toolkit.spec, 1.1, 1.2 translate-toolkit-0.8rc5-jtoolkit.patch, 1.1, NONE Message-ID: <200602041348.k14DmVbn001478@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1456 Modified Files: .cvsignore sources translate-toolkit.spec Removed Files: translate-toolkit-0.8rc5-jtoolkit.patch Log Message: * Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.6.rc6 - Update to 0.8rc6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Feb 2006 14:43:12 -0000 1.2 +++ .cvsignore 4 Feb 2006 13:47:58 -0000 1.3 @@ -1 +1 @@ -translate-toolkit-0.8rc5.tar.gz +translate-toolkit-0.8rc6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Feb 2006 14:43:12 -0000 1.2 +++ sources 4 Feb 2006 13:47:58 -0000 1.3 @@ -1 +1 @@ -f32e0c76cc043845f101feb8360d645f translate-toolkit-0.8rc5.tar.gz +3b8523a8fa2d1cc5581e7c9b16b89cca translate-toolkit-0.8rc6.tar.gz Index: translate-toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-4/translate-toolkit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- translate-toolkit.spec 1 Feb 2006 14:43:12 -0000 1.1 +++ translate-toolkit.spec 4 Feb 2006 13:47:58 -0000 1.2 @@ -1,18 +1,17 @@ %{!?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 alphatag rc5 +%define alphatag rc6 Name: translate-toolkit Version: 0.8 -Release: 0.5.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: A collection of tools to assist software localization Group: Development/Tools License: GPL URL: http://translate.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}%{alphatag}.tar.gz -Patch1: translate-toolkit-0.8rc5-jtoolkit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -28,8 +27,6 @@ %prep %setup -q -n %{name}-%{version}%{alphatag} -%patch1 -p1 -b .jtoolkit -%{__sed} -i 's/\r//' translate/doc/default.css %build @@ -42,7 +39,6 @@ # This removes the documentation files that were installed in site-packages find $RPM_BUILD_ROOT%{python_sitelib}/translate -type f -name "[[:upper:]]*" | xargs rm -fv -rm -rf $RPM_BUILD_ROOT%{python_sitelib}/translate/doc %clean @@ -52,7 +48,6 @@ %files %defattr(-,root,root,-) %doc ChangeLog translate/COPYING translate/README -%doc translate/doc/* %dir %{python_sitelib}/translate %dir %{python_sitelib}/translate/tools %dir %{python_sitelib}/translate/filters @@ -69,6 +64,9 @@ %changelog +* Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.6.rc6 +- Update to 0.8rc6 + * Sat Jan 21 2006 Roozbeh Pournader - 0.8-0.5.rc5 - Use sed instead of dos2unix --- translate-toolkit-0.8rc5-jtoolkit.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 4 14:07:00 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sat, 4 Feb 2006 09:07:00 -0500 Subject: rpms/translate-toolkit/devel sources, 1.2, 1.3 translate-toolkit.spec, 1.1, 1.2 translate-toolkit-0.8rc5-jtoolkit.patch, 1.1, NONE Message-ID: <200602041407.k14E7WGd003425@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3401 Modified Files: sources translate-toolkit.spec Removed Files: translate-toolkit-0.8rc5-jtoolkit.patch Log Message: * Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.6.rc6 - Update to 0.8rc6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Feb 2006 14:43:12 -0000 1.2 +++ sources 4 Feb 2006 14:07:00 -0000 1.3 @@ -1 +1 @@ -f32e0c76cc043845f101feb8360d645f translate-toolkit-0.8rc5.tar.gz +3b8523a8fa2d1cc5581e7c9b16b89cca translate-toolkit-0.8rc6.tar.gz Index: translate-toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/translate-toolkit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- translate-toolkit.spec 1 Feb 2006 14:43:12 -0000 1.1 +++ translate-toolkit.spec 4 Feb 2006 14:07:00 -0000 1.2 @@ -1,18 +1,17 @@ %{!?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 alphatag rc5 +%define alphatag rc6 Name: translate-toolkit Version: 0.8 -Release: 0.5.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: A collection of tools to assist software localization Group: Development/Tools License: GPL URL: http://translate.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}%{alphatag}.tar.gz -Patch1: translate-toolkit-0.8rc5-jtoolkit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -28,8 +27,6 @@ %prep %setup -q -n %{name}-%{version}%{alphatag} -%patch1 -p1 -b .jtoolkit -%{__sed} -i 's/\r//' translate/doc/default.css %build @@ -42,7 +39,6 @@ # This removes the documentation files that were installed in site-packages find $RPM_BUILD_ROOT%{python_sitelib}/translate -type f -name "[[:upper:]]*" | xargs rm -fv -rm -rf $RPM_BUILD_ROOT%{python_sitelib}/translate/doc %clean @@ -52,7 +48,6 @@ %files %defattr(-,root,root,-) %doc ChangeLog translate/COPYING translate/README -%doc translate/doc/* %dir %{python_sitelib}/translate %dir %{python_sitelib}/translate/tools %dir %{python_sitelib}/translate/filters @@ -69,6 +64,9 @@ %changelog +* Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.6.rc6 +- Update to 0.8rc6 + * Sat Jan 21 2006 Roozbeh Pournader - 0.8-0.5.rc5 - Use sed instead of dos2unix --- translate-toolkit-0.8rc5-jtoolkit.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 4 14:10:28 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sat, 4 Feb 2006 09:10:28 -0500 Subject: rpms/translate-toolkit/devel translate-toolkit.spec,1.2,1.3 Message-ID: <200602041410.k14EAlEH003484@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3466 Modified Files: translate-toolkit.spec Log Message: * Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.7.rc6 - Rebuild Index: translate-toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/translate-toolkit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- translate-toolkit.spec 4 Feb 2006 14:07:00 -0000 1.2 +++ translate-toolkit.spec 4 Feb 2006 14:10:28 -0000 1.3 @@ -5,7 +5,7 @@ Name: translate-toolkit Version: 0.8 -Release: 0.6.%{alphatag}%{?dist} +Release: 0.7.%{alphatag}%{?dist} Summary: A collection of tools to assist software localization Group: Development/Tools @@ -64,6 +64,9 @@ %changelog +* Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.7.rc6 +- Rebuild + * Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.6.rc6 - Update to 0.8rc6 From fedora-extras-commits at redhat.com Sat Feb 4 16:46:06 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Feb 2006 11:46:06 -0500 Subject: rpms/itcl - New directory Message-ID: <200602041646.k14Gk8Nw008184@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itcl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8176/itcl Log Message: Directory /cvs/extras/rpms/itcl added to the repository From fedora-extras-commits at redhat.com Sat Feb 4 16:46:12 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Feb 2006 11:46:12 -0500 Subject: rpms/itcl/devel - New directory Message-ID: <200602041646.k14GkEZL008200@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8176/itcl/devel Log Message: Directory /cvs/extras/rpms/itcl/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 4 16:46:23 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Feb 2006 11:46:23 -0500 Subject: rpms/itcl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602041646.k14GkPku008235@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itcl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8223 Added Files: Makefile import.log Log Message: Setup of module itcl --- NEW FILE Makefile --- # Top level Makefile for module itcl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 4 16:46:29 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Feb 2006 11:46:29 -0500 Subject: rpms/itcl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602041646.k14GkV6r008255@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8223/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module itcl --- NEW 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 Feb 4 16:46:56 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Feb 2006 11:46:56 -0500 Subject: rpms/itcl import.log,1.1,1.2 Message-ID: <200602041647.k14GlSHt008337@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itcl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8294 Modified Files: import.log Log Message: auto-import itcl-3.3-0.3.RC1 on branch devel from itcl-3.3-0.3.RC1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/itcl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Feb 2006 16:46:23 -0000 1.1 +++ import.log 4 Feb 2006 16:46:55 -0000 1.2 @@ -0,0 +1 @@ +itcl-3_3-0_3_RC1:HEAD:itcl-3.3-0.3.RC1.src.rpm:1139071612 From fedora-extras-commits at redhat.com Sat Feb 4 16:47:01 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Feb 2006 11:47:01 -0500 Subject: rpms/itcl/devel itcl-3.3-autotools.patch, NONE, 1.1 itcl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602041647.k14GlYMD008341@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/itcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8294/devel Modified Files: .cvsignore sources Added Files: itcl-3.3-autotools.patch itcl.spec Log Message: auto-import itcl-3.3-0.3.RC1 on branch devel from itcl-3.3-0.3.RC1.src.rpm itcl-3.3-autotools.patch: --- NEW FILE itcl-3.3-autotools.patch --- diff -Naur itcl3.3/configure itcl3.3.new/configure --- itcl3.3/configure 2006-01-11 20:43:07.000000000 -0800 +++ itcl3.3.new/configure 2006-01-11 20:45:34.000000000 -0800 @@ -1538,10 +1538,12 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then @@ -6492,7 +6494,7 @@ # results, and the version is kept in special file). if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then - system=MP-RAS-`awk '{print }' /etc/.relid'` + system=MP-RAS-`awk '{print }' /etc/.relid` fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` diff -Naur itcl3.3/generic/itcl_cmds.c itcl3.3.new/generic/itcl_cmds.c --- itcl3.3/generic/itcl_cmds.c 2005-03-25 14:58:08.000000000 -0800 +++ itcl3.3.new/generic/itcl_cmds.c 2006-01-09 14:06:36.000000000 -0800 @@ -65,6 +65,7 @@ lappend dirs [file join [file dirname $tcl_library] itcl$version]\n\ set bindir [file dirname [info nameofexecutable]]\n\ lappend dirs [file join $bindir .. lib itcl$version]\n\ + lappend dirs [file join $bindir .. lib64 itcl$version]\n\ lappend dirs [file join $bindir .. library]\n\ lappend dirs [file join $bindir .. .. library]\n\ lappend dirs [file join $bindir .. .. itcl library]\n\ diff -Naur itcl3.3/tclconfig/tcl.m4 itcl3.3.new/tclconfig/tcl.m4 --- itcl3.3/tclconfig/tcl.m4 2006-01-11 20:43:14.000000000 -0800 +++ itcl3.3.new/tclconfig/tcl.m4 2006-01-11 20:45:45.000000000 -0800 @@ -88,10 +88,12 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then @@ -199,12 +201,13 @@ fi # check in a few common install locations if test x"${ac_cv_c_tkconfig}" = x ; then - for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ - ; do if test -f "$i/tkConfig.sh" ; then ac_cv_c_tkconfig=`(cd $i; pwd)` break @@ -794,7 +797,7 @@ # results, and the version is kept in special file). if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then - system=MP-RAS-`awk '{print $3}' /etc/.relid'` + system=MP-RAS-`awk '{print $3}' /etc/.relid` fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` @@ -3639,10 +3642,12 @@ # check in a few common install locations if test x"${ac_cv_c_$1config}" = x ; then - for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ ; do if test -f "$i/$1Config.sh" ; then --- NEW FILE itcl.spec --- Name: itcl Version: 3.3 Release: 0.3.RC1%{?dist} Summary: Object oriented extensions to Tcl and Tk Group: Development/Libraries License: BSD URL: http://incrtcl.sourceforge.net/itcl/ Source0: http://easynews.dl.sourceforge.net/sourceforge/incrtcl/itcl3.3.tar.gz Patch0: itcl-3.3-autotools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tcl BuildRequires: tcl-devel %description [incr Tcl] is Tcl extension that provides object-oriented features that are missing from the Tcl language. %package devel Summary: Development headers and libraries for linking against itcl Group: Development/Libraries Requires: itcl = %{version} %description devel Development headers and libraries for linking against itcl. %prep %setup -q -n itcl3.3 %patch -p1 %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,-) %dir %{_libdir}/itcl3.3 %{_libdir}/itcl3.3/*.so %{_libdir}/itcl3.3/*.tcl %{_mandir}/mann/*.gz %doc README license.terms %files devel %defattr(-,root,root,-) %{_includedir}/*.h %{_libdir}/itcl3.3/*.a %{_libdir}/itclConfig.sh %doc %changelog * Fri Jan 27 2006 Wart - 3.3-0.3.RC1 - Remove duplicate in file list. * Wed Jan 11 2006 Wart - 3.3-0.2.RC1 - Fix quoting bug that is exposed by bash >= 3.1 * Mon Jan 9 2006 Wart - 3.3-0.1.RC1 - Update to 3.3 upstream sources. itk now uses a different source archive than itcl and has been moved to a separate spec file. * Wed Dec 28 2005 Wart - 3.2.1-4 - Create itk as a subpackage. - Rename patch to include version number. - New source url. * Fri Nov 25 2005 Wart - 3.2.1-3 - Minor fixes to remove rpmlint warnings. - Move DSOs to itcl library directory instead of polluting /usr/lib. * Sat Oct 22 2005 Wart - 3.2.1-2 - Look for itk.tcl in the lib64 directory for x86_64 platforms. * Fri Oct 21 2005 Wart - 3.2.1-1 - Intial spec file for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/itcl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Feb 2006 16:46:29 -0000 1.1 +++ .cvsignore 4 Feb 2006 16:47:01 -0000 1.2 @@ -0,0 +1 @@ +itcl3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/itcl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Feb 2006 16:46:29 -0000 1.1 +++ sources 4 Feb 2006 16:47:01 -0000 1.2 @@ -0,0 +1 @@ +d958b3d1c52fa5336b5aacc1251b5ce3 itcl3.3.tar.gz From fedora-extras-commits at redhat.com Sat Feb 4 16:48:48 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Feb 2006 11:48:48 -0500 Subject: fedora-rpmdevtools check-rpaths-worker, 1.7, 1.8 fedora-rpmdevtools.spec, 1.85, 1.86 Message-ID: <200602041648.k14GmmWx008417@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8397 Modified Files: check-rpaths-worker fedora-rpmdevtools.spec Log Message: * Sat Feb 4 2006 Ville Skytt?? - 1.4-2 - Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz). Index: check-rpaths-worker =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/check-rpaths-worker,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- check-rpaths-worker 15 Oct 2005 19:48:11 -0000 1.7 +++ check-rpaths-worker 4 Feb 2006 16:48:40 -0000 1.8 @@ -18,7 +18,6 @@ fail= -IFS=: already_shown=0 # effect of this expression is obviously: @@ -97,13 +96,16 @@ } : ${QA_RPATHS:=0} +old_IFS=$IFS for i; do pos=0 rpath=$(readelf -d "$i" 2>/dev/null | LANG=C grep '(RPATH).*:') || continue rpath=$(echo "$rpath" | LANG=C sed -e 's!.*(RPATH).*: \[\(.*\)\]!\1!p;d') tmp=aux:$rpath:/lib/aux || : + IFS=: set -- $tmp + IFS=$old_IFS shift allow_ORIGIN=1 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- fedora-rpmdevtools.spec 30 Dec 2005 17:32:57 -0000 1.85 +++ fedora-rpmdevtools.spec 4 Feb 2006 16:48:40 -0000 1.86 @@ -4,7 +4,7 @@ Name: fedora-rpmdevtools Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fedora RPM Development Tools Group: Development/Tools @@ -13,6 +13,7 @@ # rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/ Source0: %{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 +Patch0: %{name}-cpw-bash31.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -46,6 +47,7 @@ %prep %setup -q -a 1 +%patch0 -p1 cp -p spectool*/README README.spectool @@ -127,6 +129,9 @@ %changelog +* Sat Feb 4 2006 Ville Skytt?? - 1.4-2 +- Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz). + * Fri Dec 30 2005 Ville Skytt?? - 1.4-1 - Update spectool to 1.0.6 (#176521). From fedora-extras-commits at redhat.com Sat Feb 4 16:49:22 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Feb 2006 11:49:22 -0500 Subject: owners owners.list,1.606,1.607 Message-ID: <200602041649.k14Gnt3S008474@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8428 Modified Files: owners.list Log Message: Added itcl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.606 retrieving revision 1.607 diff -u -r1.606 -r1.607 --- owners.list 4 Feb 2006 05:57:59 -0000 1.606 +++ owners.list 4 Feb 2006 16:49:22 -0000 1.607 @@ -431,6 +431,7 @@ 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|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| Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|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| From fedora-extras-commits at redhat.com Sat Feb 4 16:49:41 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Feb 2006 11:49:41 -0500 Subject: rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-cpw-bash31.patch, NONE, 1.1 fedora-rpmdevtools.spec, 1.14, 1.15 Message-ID: <200602041650.k14GoEfr008493@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8454 Modified Files: fedora-rpmdevtools.spec Added Files: fedora-rpmdevtools-cpw-bash31.patch Log Message: * Sat Feb 4 2006 Ville Skytt?? - 1.4-2 - Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz). fedora-rpmdevtools-cpw-bash31.patch: --- NEW FILE fedora-rpmdevtools-cpw-bash31.patch --- --- fedora-rpmdevtools-1.4/check-rpaths-worker.ifs 2005-10-15 21:48:11.000000000 +0200 +++ fedora-rpmdevtools-1.4/check-rpaths-worker 2006-02-04 13:41:51.182579267 +0100 @@ -18,7 +18,6 @@ fail= -IFS=: already_shown=0 # effect of this expression is obviously: @@ -97,13 +96,16 @@ } : ${QA_RPATHS:=0} +old_IFS=$IFS for i; do pos=0 rpath=$(readelf -d "$i" 2>/dev/null | LANG=C grep '(RPATH).*:') || continue rpath=$(echo "$rpath" | LANG=C sed -e 's!.*(RPATH).*: \[\(.*\)\]!\1!p;d') tmp=aux:$rpath:/lib/aux || : + IFS=: set -- $tmp + IFS=$old_IFS shift allow_ORIGIN=1 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fedora-rpmdevtools.spec 30 Dec 2005 17:47:27 -0000 1.14 +++ fedora-rpmdevtools.spec 4 Feb 2006 16:49:41 -0000 1.15 @@ -4,7 +4,7 @@ Name: fedora-rpmdevtools Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fedora RPM Development Tools Group: Development/Tools @@ -13,6 +13,7 @@ # rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/ Source0: %{name}-%{version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 +Patch0: %{name}-cpw-bash31.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -46,6 +47,7 @@ %prep %setup -q -a 1 +%patch0 -p1 cp -p spectool*/README README.spectool @@ -127,6 +129,9 @@ %changelog +* Sat Feb 4 2006 Ville Skytt?? - 1.4-2 +- Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz). + * Fri Dec 30 2005 Ville Skytt?? - 1.4-1 - Update spectool to 1.0.6 (#176521). From fedora-extras-commits at redhat.com Sat Feb 4 16:50:02 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 4 Feb 2006 11:50:02 -0500 Subject: rpms/python-sqlite2/FC-4 python-sqlite2.spec,1.3,1.4 Message-ID: <200602041650.k14GoYjF008496@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/python-sqlite2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8393 Modified Files: python-sqlite2.spec Log Message: Run tests (PYTHONPATH thing stolen from numpy spec file ;-) ) Index: python-sqlite2.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/FC-4/python-sqlite2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-sqlite2.spec 2 Feb 2006 23:34:45 -0000 1.3 +++ python-sqlite2.spec 4 Feb 2006 16:50:02 -0000 1.4 @@ -45,6 +45,10 @@ dos2unix documentation/code/* +%check +PYTHONPATH="%{buildroot}%{python_sitearch}" scripts/test-pysqlite + + %clean rm -rf %{buildroot} @@ -84,8 +88,9 @@ %changelog -* Fri Feb 3 2006 Dawid Gajownik - 1:2.0.7-1 +* Sat Feb 4 2006 Dawid Gajownik - 1:2.0.7-1 - Downgrade to 2.0.7 (sqlite in FC-4 is too old) +- Run tests * Tue Jan 17 2006 Dawid Gajownik - 2.1.0-1 - Update to 2.1.0 From fedora-extras-commits at redhat.com Sat Feb 4 17:27:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 4 Feb 2006 12:27:19 -0500 Subject: rpms/tog-pegasus/devel .cvsignore, 1.2, NONE Makefile, 1.1, NONE README.RedHat.Security, 1.1, NONE access.conf, 1.1, NONE genSSLcerts, 1.1, NONE pegasus-2.5-add_cmpi_provider_lib.patch, 1.1, NONE pegasus-2.5-bz173401.patch, 1.1, NONE pegasus-2.5-enable_cql.patch, 1.1, NONE pegasus-2.5-local-or-remote-auth.patch, 1.1, NONE pegasus-2.5-make_install.patch, 1.1, NONE pegasus-2.5-redhat.patch, 1.1, NONE rpm_build_env, 1.1, NONE sources, 1.2, NONE tog-pegasus.spec, 1.1, NONE Message-ID: <200602041727.k14HRLMC011366@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11354 Removed Files: .cvsignore Makefile README.RedHat.Security access.conf genSSLcerts pegasus-2.5-add_cmpi_provider_lib.patch pegasus-2.5-bz173401.patch pegasus-2.5-enable_cql.patch pegasus-2.5-local-or-remote-auth.patch pegasus-2.5-make_install.patch pegasus-2.5-redhat.patch rpm_build_env sources tog-pegasus.spec Log Message: FLUSH! --- .cvsignore DELETED --- --- Makefile DELETED --- --- README.RedHat.Security DELETED --- --- access.conf DELETED --- --- genSSLcerts DELETED --- --- pegasus-2.5-add_cmpi_provider_lib.patch DELETED --- --- pegasus-2.5-bz173401.patch DELETED --- --- pegasus-2.5-enable_cql.patch DELETED --- --- pegasus-2.5-local-or-remote-auth.patch DELETED --- --- pegasus-2.5-make_install.patch DELETED --- --- pegasus-2.5-redhat.patch DELETED --- --- rpm_build_env DELETED --- --- sources DELETED --- --- tog-pegasus.spec DELETED --- From fedora-extras-commits at redhat.com Sat Feb 4 19:11:15 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Feb 2006 14:11:15 -0500 Subject: rpms/bash-completion/devel bash-completion-20050721-mtr.patch, NONE, 1.1 bash-completion.spec, 1.13, 1.14 Message-ID: <200602041911.k14JBqlk015759@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15739 Modified Files: bash-completion.spec Added Files: bash-completion-20050721-mtr.patch Log Message: * Sat Feb 4 2006 Ville Skytt?? - Add mtr(8) completion using known hosts (#179918, Yanko Kaneti). bash-completion-20050721-mtr.patch: --- NEW FILE bash-completion-20050721-mtr.patch --- --- bash_completion~ 2005-07-21 22:21:22.000000000 +0300 +++ bash_completion 2006-02-04 21:05:17.000000000 +0200 @@ -2492,3 +2492,3 @@ complete -F _known_hosts traceroute traceroute6 tracepath tracepath6 \ - ping fping telnet host nslookup rsh rlogin ftp dig ssh-installkeys + ping fping telnet host nslookup rsh rlogin ftp dig ssh-installkeys mtr Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- bash-completion.spec 17 Jan 2006 20:59:57 -0000 1.13 +++ bash-completion.spec 4 Feb 2006 19:11:14 -0000 1.14 @@ -13,6 +13,7 @@ Source4: %{name}-plague-client Patch0: %{name}-20050721-cvs-stat.patch Patch1: %{name}-20050721-bash31quoting.patch +Patch2: %{name}-20050721-mtr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,6 +28,7 @@ %setup -q -n bash_completion %patch0 %patch1 -p1 +%patch2 install -pm 644 %{SOURCE2} contrib/mock install -pm 644 %{SOURCE3} contrib/plague-client install -pm 644 %{SOURCE3} contrib/repomanage @@ -90,6 +92,9 @@ %changelog +* Sat Feb 4 2006 Ville Skytt?? +- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti). + * Sun Jan 8 2006 Ville Skytt?? - 20050721-3 - Patch to hopefully fix quoting problems with bash 3.1 (#177056). From fedora-extras-commits at redhat.com Sat Feb 4 19:22:38 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 14:22:38 -0500 Subject: rpms/numpy/devel numpy.spec,1.1,1.2 Message-ID: <200602041923.k14JNAKU015823@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/numpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15806 Modified Files: numpy.spec Log Message: Giving credit where credit is due Index: numpy.spec =================================================================== RCS file: /cvs/extras/rpms/numpy/devel/numpy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- numpy.spec 4 Feb 2006 05:46:41 -0000 1.1 +++ numpy.spec 4 Feb 2006 19:22:38 -0000 1.2 @@ -66,3 +66,4 @@ %changelog * Thu Feb 2 2006 Ignacio Vazquez-Abrams 0.9.4-1 - Initial RPM release +- Added gfortran patch from Neal Becker From fedora-extras-commits at redhat.com Sat Feb 4 19:26:09 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 14:26:09 -0500 Subject: rpms/numpy/FC-4 numpy.spec,1.1,1.2 Message-ID: <200602041926.k14JQfYe015856@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/numpy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15839/FC-4 Modified Files: numpy.spec Log Message: Giving credit where credit is due Index: numpy.spec =================================================================== RCS file: /cvs/extras/rpms/numpy/FC-4/numpy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- numpy.spec 4 Feb 2006 05:46:41 -0000 1.1 +++ numpy.spec 4 Feb 2006 19:26:09 -0000 1.2 @@ -66,3 +66,4 @@ %changelog * Thu Feb 2 2006 Ignacio Vazquez-Abrams 0.9.4-1 - Initial RPM release +- Added gfortran patch from Neal Becker From fedora-extras-commits at redhat.com Sat Feb 4 19:58:39 2006 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 4 Feb 2006 14:58:39 -0500 Subject: rpms/xmldiff/devel xmldiff-0.6.7-x64safe.patch, NONE, 1.1 xmldiff.spec, 1.5, 1.6 Message-ID: <200602041959.k14JxBUH016105@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/xmldiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16085 Modified Files: xmldiff.spec Added Files: xmldiff-0.6.7-x64safe.patch Log Message: Include x86_64 patch and remove ExcludeArch (thanks Ville Skytta); 0.6.7-9 xmldiff-0.6.7-x64safe.patch: --- NEW FILE xmldiff-0.6.7-x64safe.patch --- diff -Nru xmldiff-0.6.7-orig/extensions/maplookup.c xmldiff-0.6.7/extensions/maplookup.c --- xmldiff-0.6.7-orig/extensions/maplookup.c 2005-05-03 17:28:45.000000000 +0200 +++ xmldiff-0.6.7/extensions/maplookup.c 2005-06-24 18:08:39.327922316 +0200 @@ -1,5 +1,6 @@ #include #include +#include char * __revision__ = "$Id: maplookup.c,v 1.9 2005/04/30 11:59:47 ludal Exp $"; @@ -156,11 +157,19 @@ { PyObject *key ; couple = PyList_GET_ITEM(_mapping, i) ; - key = Py_BuildValue("(i,i)", (int)node1, (int)PyTuple_GET_ITEM(couple, 0)) ; +#if __WORDSIZE == 64 + key = Py_BuildValue("(l,l)", (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ; +#else + key = Py_BuildValue("(i,i)", (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ; +#endif if (PyDict_GetItem(_dict1, key) != NULL) { Py_DECREF(key) ; - key = Py_BuildValue("(i,i)", (int)node2, (int)PyTuple_GET_ITEM(couple, 1)) ; +#if __WORDSIZE == 64 + key = Py_BuildValue("(l,l)", (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ; +#else + key = Py_BuildValue("(i,i)", (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ; +#endif if (PyDict_GetItem(_dict2, key) != NULL) { seq_num += 1 ; Index: xmldiff.spec =================================================================== RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xmldiff.spec 28 Jan 2006 22:30:36 -0000 1.5 +++ xmldiff.spec 4 Feb 2006 19:58:39 -0000 1.6 @@ -2,7 +2,7 @@ Name: xmldiff Version: 0.6.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text @@ -13,6 +13,7 @@ Source1: GPL Patch0: xmldiff-0.6.7-xsldata.patch Patch1: xmldiff-0.6.7-clean-tmp.patch +Patch2: xmldiff-0.6.7-x64safe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -24,8 +25,6 @@ Requires: /usr/bin/sgmlnorm Requires: /usr/bin/xsltproc -# see bug #177083 -ExcludeArch: x86_64 %description The xmldiff utility extracts differences between two XML files. It @@ -39,6 +38,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 for i in man/*.1 __pkginfo__.py doc/*.txt do iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i" @@ -86,6 +86,9 @@ %changelog +* Sat Feb 4 2006 Paul W. Frields - 0.6.7-9 +- Include x86_64 patch and remove ExcludeArch (thanks to Ville Skytta) + * Sat Jan 28 2006 Paul W. Frields - 0.6.7-8 - ExcludeArch includes spurious values from misplaced comment From fedora-extras-commits at redhat.com Sat Feb 4 20:00:46 2006 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 4 Feb 2006 15:00:46 -0500 Subject: rpms/xmldiff/FC-4 xmldiff-0.6.7-x64safe.patch, NONE, 1.1 xmldiff.spec, 1.5, 1.6 Message-ID: <200602042001.k14K1Kd9017889@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/xmldiff/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16134 Modified Files: xmldiff.spec Added Files: xmldiff-0.6.7-x64safe.patch Log Message: Include x86_64 patch and remove ExcludeArch (thanks Ville Skytta); 0.6.7-9 xmldiff-0.6.7-x64safe.patch: --- NEW FILE xmldiff-0.6.7-x64safe.patch --- diff -Nru xmldiff-0.6.7-orig/extensions/maplookup.c xmldiff-0.6.7/extensions/maplookup.c --- xmldiff-0.6.7-orig/extensions/maplookup.c 2005-05-03 17:28:45.000000000 +0200 +++ xmldiff-0.6.7/extensions/maplookup.c 2005-06-24 18:08:39.327922316 +0200 @@ -1,5 +1,6 @@ #include #include +#include char * __revision__ = "$Id: maplookup.c,v 1.9 2005/04/30 11:59:47 ludal Exp $"; @@ -156,11 +157,19 @@ { PyObject *key ; couple = PyList_GET_ITEM(_mapping, i) ; - key = Py_BuildValue("(i,i)", (int)node1, (int)PyTuple_GET_ITEM(couple, 0)) ; +#if __WORDSIZE == 64 + key = Py_BuildValue("(l,l)", (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ; +#else + key = Py_BuildValue("(i,i)", (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ; +#endif if (PyDict_GetItem(_dict1, key) != NULL) { Py_DECREF(key) ; - key = Py_BuildValue("(i,i)", (int)node2, (int)PyTuple_GET_ITEM(couple, 1)) ; +#if __WORDSIZE == 64 + key = Py_BuildValue("(l,l)", (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ; +#else + key = Py_BuildValue("(i,i)", (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ; +#endif if (PyDict_GetItem(_dict2, key) != NULL) { seq_num += 1 ; Index: xmldiff.spec =================================================================== RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xmldiff.spec 28 Jan 2006 22:30:19 -0000 1.5 +++ xmldiff.spec 4 Feb 2006 20:00:46 -0000 1.6 @@ -2,7 +2,7 @@ Name: xmldiff Version: 0.6.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text @@ -13,6 +13,7 @@ Source1: GPL Patch0: xmldiff-0.6.7-xsldata.patch Patch1: xmldiff-0.6.7-clean-tmp.patch +Patch2: xmldiff-0.6.7-x64safe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -24,8 +25,6 @@ Requires: /usr/bin/sgmlnorm Requires: /usr/bin/xsltproc -# see bug #177083 -ExcludeArch: x86_64 %description The xmldiff utility extracts differences between two XML files. It @@ -39,6 +38,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 for i in man/*.1 __pkginfo__.py doc/*.txt do iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i" @@ -86,6 +86,9 @@ %changelog +* Sat Feb 4 2006 Paul W. Frields - 0.6.7-9 +- Include x86_64 patch and remove ExcludeArch (thanks to Ville Skytta) + * Sat Jan 28 2006 Paul W. Frields - 0.6.7-8 - ExcludeArch includes spurious values from misplaced comment From fedora-extras-commits at redhat.com Sat Feb 4 21:14:26 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:14:26 -0500 Subject: rpms/python-formencode/devel python-formencode.spec,1.4,1.5 Message-ID: <200602042114.k14LExDM019987@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-formencode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19970 Modified Files: python-formencode.spec Log Message: - Fix build on devel - Switch to unmanaged egg Index: python-formencode.spec =================================================================== RCS file: /cvs/extras/rpms/python-formencode/devel/python-formencode.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-formencode.spec 29 Dec 2005 07:01:04 -0000 1.4 +++ python-formencode.spec 4 Feb 2006 21:14:25 -0000 1.5 @@ -3,13 +3,14 @@ Name: python-formencode Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML form validation, generation, and convertion package Group: Development/Libraries License: PSF URL: http://formencode.org/ Source0: http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz +Patch: python-formencode-0.4-badurl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -25,6 +26,7 @@ %prep %setup -q -n FormEncode-%{version} +%patch -p1 -b .badurl %build %{__python} setup.py build @@ -32,8 +34,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -echo "FormEncode-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/FormEncode.pth +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed %clean @@ -43,10 +44,14 @@ %files %defattr(-,root,root,-) %doc PKG-INFO docs -%{python_sitelib}/FormEncode.pth -%{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg +%{python_sitelib}/formencode +%{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info %changelog +* Sat Feb 4 2006 Ignacio Vazquez-Abrams 0.4-2 +- Fix build on devel +- Switch to unmanaged egg + * Thu Dec 29 2005 Ignacio Vazquez-Abrams 0.4-1 - Upstream update From fedora-extras-commits at redhat.com Sat Feb 4 21:16:01 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:16:01 -0500 Subject: rpms/python-formencode/devel python-formencode-0.4-badurl.patch, NONE, 1.1 Message-ID: <200602042116.k14LG3qd020050@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-formencode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20038 Added Files: python-formencode-0.4-badurl.patch Log Message: Need the patch too python-formencode-0.4-badurl.patch: --- NEW FILE python-formencode-0.4-badurl.patch --- --- FormEncode-0.4/setup.cfg.badurl 2006-02-04 04:46:12.000000000 -0500 +++ FormEncode-0.4/setup.cfg 2006-02-04 04:46:15.000000000 -0500 @@ -1,5 +1,4 @@ [easy_install] -find_links = http://svn.pythonpaste.org/package_index.html [pudge] title = FormEncode From fedora-extras-commits at redhat.com Sat Feb 4 21:21:16 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 4 Feb 2006 16:21:16 -0500 Subject: rpms/denyhosts/devel denyhosts-2.0-daemon-control.patch, NONE, 1.1 denyhosts-2.0-setup.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 denyhosts.spec, 1.23, 1.24 sources, 1.14, 1.15 denyhosts-0.9.8-setup.patch, 1.1, NONE denyhosts-1.0.0-daemon-control.patch, 1.1, NONE Message-ID: <200602042121.k14LLmDk020174@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20144 Modified Files: .cvsignore denyhosts.spec sources Added Files: denyhosts-2.0-daemon-control.patch denyhosts-2.0-setup.patch Removed Files: denyhosts-0.9.8-setup.patch denyhosts-1.0.0-daemon-control.patch Log Message: * Sat Feb 4 2006 Jason L Tibbitts III - 2.0-1 - Update to 2.0. denyhosts-2.0-daemon-control.patch: --- NEW FILE denyhosts-2.0-daemon-control.patch --- --- daemon-control-dist.orig 2006-02-03 22:13:05.000000000 -0600 +++ daemon-control-dist 2006-02-04 15:14:02.758336216 -0600 @@ -13,7 +13,7 @@ DENYHOSTS_BIN = "/usr/bin/denyhosts.py" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### denyhosts-2.0-setup.patch: --- NEW FILE denyhosts-2.0-setup.patch --- --- setup.py.orig 2006-01-16 18:02:18.000000000 -0600 +++ setup.py 2006-02-04 15:10:37.104646027 -0600 @@ -22,13 +22,13 @@ package_dir={'DenyHosts': 'DenyHosts'}, packages=["DenyHosts"], ##py_modules=["denyhosts_version"], - data_files=[(libpath, glob("denyhosts.cfg-dist")), - (libpath, glob("denyhosts-daemon-initscript")), - (libpath, glob("setup.py")), - (libpath, glob("daemon-control-dist")), - (libpath, glob("CHANGELOG.txt")), - (libpath, glob("README.txt")), - (libpath, glob("LICENSE.txt"))], +# data_files=[(libpath, glob("denyhosts.cfg-dist")), +# (libpath, glob("denyhosts-daemon-initscript")), +# (libpath, glob("setup.py")), +# (libpath, glob("daemon-control-dist")), +# (libpath, glob("CHANGELOG.txt")), +# (libpath, glob("README.txt")), +# (libpath, glob("LICENSE.txt"))], license="GPL v2", ##extra_path='denyhosts', long_description=""" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 13 Jan 2006 16:58:26 -0000 1.14 +++ .cvsignore 4 Feb 2006 21:21:16 -0000 1.15 @@ -1 +1 @@ -DenyHosts-1.1.4.tar.gz +DenyHosts-2.0.tar.gz Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- denyhosts.spec 30 Jan 2006 23:22:30 -0000 1.23 +++ denyhosts.spec 4 Feb 2006 21:21:16 -0000 1.24 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 1.1.4 -release: 5%{?dist} +Version: 2.0 +release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -14,8 +14,8 @@ Source5: denyhosts.logrotate Source6: README.fedora Patch0: denyhosts-1.1.4-config.patch -Patch1: denyhosts-0.9.8-setup.patch -Patch2: denyhosts-1.0.0-daemon-control.patch +Patch1: denyhosts-2.0-setup.patch +Patch2: denyhosts-2.0-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -131,6 +131,9 @@ %changelog +* Sat Feb 4 2006 Jason L Tibbitts III - 2.0-1 +- Update to 2.0. + * Mon Jan 30 2006 Jason L Tibbitts III - 1.1.4-5 - Redo installation to match current Python packaging guidelines. Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 13 Jan 2006 16:58:26 -0000 1.14 +++ sources 4 Feb 2006 21:21:16 -0000 1.15 @@ -1 +1 @@ -f4b9beb55cc36ab44fb7fe0c96210734 DenyHosts-1.1.4.tar.gz +9aa861692f52f6a0cdd3834122f53e04 DenyHosts-2.0.tar.gz --- denyhosts-0.9.8-setup.patch DELETED --- --- denyhosts-1.0.0-daemon-control.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 4 21:24:34 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:24:34 -0500 Subject: rpms/python-json - New directory Message-ID: <200602042124.k14LOaeS020274@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-json In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20266/python-json Log Message: Directory /cvs/extras/rpms/python-json added to the repository From fedora-extras-commits at redhat.com Sat Feb 4 21:24:39 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:24:39 -0500 Subject: rpms/python-json/devel - New directory Message-ID: <200602042124.k14LOf64020289@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-json/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20266/python-json/devel Log Message: Directory /cvs/extras/rpms/python-json/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 4 21:24:58 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:24:58 -0500 Subject: rpms/python-json Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602042125.k14LP0Nv020323@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-json In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20311 Added Files: Makefile import.log Log Message: Setup of module python-json --- NEW FILE Makefile --- # Top level Makefile for module python-json all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 4 21:25:04 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:25:04 -0500 Subject: rpms/python-json/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602042125.k14LP6k5020343@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-json/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20311/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-json --- NEW 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 Feb 4 21:25:39 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:25:39 -0500 Subject: rpms/python-json import.log,1.1,1.2 Message-ID: <200602042126.k14LQBLG020414@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-json In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20377 Modified Files: import.log Log Message: auto-import python-json-3.4-1 on branch devel from python-json-3.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-json/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Feb 2006 21:24:58 -0000 1.1 +++ import.log 4 Feb 2006 21:25:38 -0000 1.2 @@ -0,0 +1 @@ +python-json-3_4-1:HEAD:python-json-3.4-1.src.rpm:1139088331 From fedora-extras-commits at redhat.com Sat Feb 4 21:25:44 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:25:44 -0500 Subject: rpms/python-json/devel python-json.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602042126.k14LQHOx020418@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-json/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20377/devel Modified Files: .cvsignore sources Added Files: python-json.spec Log Message: auto-import python-json-3.4-1 on branch devel from python-json-3.4-1.src.rpm --- NEW FILE python-json.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)")} %{!?pydir: %define pydir %(%{__python} -c "from distutils.sysconfig import get_config_vars; print get_config_vars()['LIBDEST']")} Name: python-json Version: 3.4 %define version_munge %(sed 's/\\./_/g' <<< %{version}) Release: 1 Summary: A JSON reader and writer for Python Group: Development/Languages License: LGPL URL: https://sourceforge.net/projects/json-py/ Source0: http://dl.sourceforge.net/json-py/json-py-%{version_munge}.zip 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 json.py is an implementation of a JSON (http://json.org) reader and writer in Python. %prep %setup -q -c chmod a-x * %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{python_sitelib} install -p -m 0644 json.py minjson.py $RPM_BUILD_ROOT%{python_sitelib} %{__python} %{pydir}/compileall.py $RPM_BUILD_ROOT%{python_sitelib} %{__python} -O %{pydir}/compileall.py $RPM_BUILD_ROOT%{python_sitelib} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc changes.txt jsontest.py license.txt readme.txt %{python_sitelib}/*.py %{python_sitelib}/*.py[co] %changelog * Fri Dec 30 2005 Ignacio Vazquez-Abrams 3.4-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-json/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Feb 2006 21:25:04 -0000 1.1 +++ .cvsignore 4 Feb 2006 21:25:44 -0000 1.2 @@ -0,0 +1 @@ +json-py-3_4.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-json/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Feb 2006 21:25:04 -0000 1.1 +++ sources 4 Feb 2006 21:25:44 -0000 1.2 @@ -0,0 +1 @@ +921ebfede886a10ff32d6d4b4e216f8f json-py-3_4.zip From fedora-extras-commits at redhat.com Sat Feb 4 21:27:24 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:27:24 -0500 Subject: rpms/python-TestGears - New directory Message-ID: <200602042127.k14LRQVB020502@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-TestGears In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20493/python-TestGears Log Message: Directory /cvs/extras/rpms/python-TestGears added to the repository From fedora-extras-commits at redhat.com Sat Feb 4 21:27:30 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:27:30 -0500 Subject: rpms/python-TestGears/devel - New directory Message-ID: <200602042127.k14LRWJc020517@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-TestGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20493/python-TestGears/devel Log Message: Directory /cvs/extras/rpms/python-TestGears/devel added to the repository From fedora-extras-commits at redhat.com Sat Feb 4 21:27:52 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:27:52 -0500 Subject: rpms/python-TestGears Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602042127.k14LRss9020551@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-TestGears In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20539 Added Files: Makefile import.log Log Message: Setup of module python-TestGears --- NEW FILE Makefile --- # Top level Makefile for module python-TestGears all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 4 21:27:58 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:27:58 -0500 Subject: rpms/python-TestGears/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602042128.k14LS02J020571@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-TestGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20539/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-TestGears --- NEW 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 Feb 4 21:28:33 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:28:33 -0500 Subject: rpms/python-TestGears import.log,1.1,1.2 Message-ID: <200602042129.k14LT662020639@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-TestGears In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20605 Modified Files: import.log Log Message: auto-import python-TestGears-0.2-1 on branch devel from python-TestGears-0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-TestGears/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Feb 2006 21:27:52 -0000 1.1 +++ import.log 4 Feb 2006 21:28:33 -0000 1.2 @@ -0,0 +1 @@ +python-TestGears-0_2-1:HEAD:python-TestGears-0.2-1.src.rpm:1139088503 From fedora-extras-commits at redhat.com Sat Feb 4 21:28:39 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 16:28:39 -0500 Subject: rpms/python-TestGears/devel python-TestGears.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602042129.k14LTBEB020643@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-TestGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20605/devel Modified Files: .cvsignore sources Added Files: python-TestGears.spec Log Message: auto-import python-TestGears-0.2-1 on branch devel from python-TestGears-0.2-1.src.rpm --- NEW FILE python-TestGears.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-TestGears Version: 0.2 Release: 1 Summary: Unit testing for Python Group: Development/Languages License: MIT URL: http://www.turbogears.org/testgears/ Source0: http://www.turbogears.org/download/eggs/TestGears-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel python-setuptools Requires: python-abi = %{pyver} %description TestGears provides automatic discovery of unittest.TestCases and the ability to run tests that are written as simple functions. It generates a standard unittest.TestSuite for use with any of the standard frontends, and provides a distutils command to run tests with zero configuration. %prep %setup -q -n TestGears-%{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 echo "TestGears-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/TestGears.pth %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc docs LICENSE.txt TODO.txt %{python_sitelib}/TestGears-%{version}-py%{pyver}.egg %{python_sitelib}/TestGears.pth %changelog * Sat Dec 24 2005 Ignacio Vazquez-Abrams 0.2-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-TestGears/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Feb 2006 21:27:58 -0000 1.1 +++ .cvsignore 4 Feb 2006 21:28:39 -0000 1.2 @@ -0,0 +1 @@ +TestGears-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-TestGears/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Feb 2006 21:27:58 -0000 1.1 +++ sources 4 Feb 2006 21:28:39 -0000 1.2 @@ -0,0 +1 @@ +1911b1555cf8869e14d1f71da590bc0e TestGears-0.2.tar.gz From fedora-extras-commits at redhat.com Sat Feb 4 22:25:41 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Sat, 4 Feb 2006 17:25:41 -0500 Subject: rpms/ruby-mysql/devel ruby-mysql.spec,1.1,1.2 Message-ID: <200602042226.k14MQM0G022623@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/rpms/ruby-mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22600 Modified Files: ruby-mysql.spec Log Message: Fixed some x86_64 packaging issues. Index: ruby-mysql.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mysql/devel/ruby-mysql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ruby-mysql.spec 3 Feb 2006 22:14:22 -0000 1.1 +++ ruby-mysql.spec 4 Feb 2006 22:25:40 -0000 1.2 @@ -1,6 +1,9 @@ +%{!?ruby_sitearch: %define ruby_sitearch %(/usr/bin/ruby -rrbconfig -e "puts Config::CONFIG['sitearch']")} +%{!?ruby_sitearchdir: %define ruby_sitearchdir %(/usr/bin/ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")} + Name: ruby-mysql Version: 2.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Ruby interface to MySQL Group: Development/Languages @@ -33,9 +36,12 @@ %files %defattr(-,root,root,-) %doc README.html README_ja.html tommy.css COPYING COPYING.ja -%{_libdir}/site_ruby/1.8/i386-linux/mysql.so +%{ruby_sitearchdir}/mysql.so %changelog +* Fri Feb 04 2006 Oliver Andrich - 2.7-6 +- fixed the build problems in x86_64 + * Fri Feb 03 2006 Oliver Andrich - 2.7-5 - included the license documents COPYING and COPYING.ja - fixed the license: Distributable -> GPL From fedora-extras-commits at redhat.com Sat Feb 4 22:28:25 2006 From: fedora-extras-commits at redhat.com (Oliver Andrich (oa)) Date: Sat, 4 Feb 2006 17:28:25 -0500 Subject: rpms/ruby-mysql/FC-4 ruby-mysql.spec,1.1,1.2 Message-ID: <200602042228.k14MSw24022685@cvs-int.fedora.redhat.com> Author: oa Update of /cvs/extras/rpms/ruby-mysql/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22668 Modified Files: ruby-mysql.spec Log Message: fixed x86_64 packaging issues Index: ruby-mysql.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mysql/FC-4/ruby-mysql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ruby-mysql.spec 3 Feb 2006 22:14:22 -0000 1.1 +++ ruby-mysql.spec 4 Feb 2006 22:28:25 -0000 1.2 @@ -1,6 +1,9 @@ +%{!?ruby_sitearch: %define ruby_sitearch %(/usr/bin/ruby -rrbconfig -e "puts Config::CONFIG['sitearch']")} +%{!?ruby_sitearchdir: %define ruby_sitearchdir %(/usr/bin/ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")} + Name: ruby-mysql Version: 2.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Ruby interface to MySQL Group: Development/Languages @@ -33,9 +36,12 @@ %files %defattr(-,root,root,-) %doc README.html README_ja.html tommy.css COPYING COPYING.ja -%{_libdir}/site_ruby/1.8/i386-linux/mysql.so +%{ruby_sitearchdir}/mysql.so %changelog +* Fri Feb 04 2006 Oliver Andrich - 2.7-6 +- fixed the build problems in x86_64 + * Fri Feb 03 2006 Oliver Andrich - 2.7-5 - included the license documents COPYING and COPYING.ja - fixed the license: Distributable -> GPL From fedora-extras-commits at redhat.com Sat Feb 4 22:47:50 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 4 Feb 2006 17:47:50 -0500 Subject: rpms/nagios/devel nagios.htaccess,1.1,1.2 nagios.spec,1.4,1.5 Message-ID: <200602042248.k14MmN9D022773@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22754 Modified Files: nagios.htaccess nagios.spec Log Message: Fixed issues with Apache config. Index: nagios.htaccess =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.htaccess,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nagios.htaccess 27 Jan 2006 20:10:12 -0000 1.1 +++ nagios.htaccess 4 Feb 2006 22:47:50 -0000 1.2 @@ -4,6 +4,7 @@ order deny,allow deny from all allow from 127.0.0.1 + require valid-user Alias /nagios/ /usr/share/nagios/html/ @@ -12,6 +13,7 @@ order deny,allow deny from all allow from 127.0.0.1 + require valid-user # For SSL-servers @@ -22,11 +24,9 @@ # order deny,allow # deny from all # AuthType Basic -# AuthUserFile /site/cfg/passwd -# AuthGroupFile /site/cfg/group +# AuthUserFile /etc/nagios/passwd # AuthName "nagios" -# require group nagios -# Satisfy Any +# require valid-user # # #Alias /nagios/ /usr/share/nagios/html/ @@ -36,10 +36,8 @@ # order deny,allow # deny from all # AuthType Basic -# AuthUserFile /site/cfg/passwd -# AuthGroupFile /site/cfg/group +# AuthUserFile /etc/nagios/passwd # AuthName "nagios" -# require group nagios -# Satisfy Any +# require valid-user # Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nagios.spec 27 Jan 2006 20:10:12 -0000 1.4 +++ nagios.spec 4 Feb 2006 22:47:50 -0000 1.5 @@ -1,6 +1,6 @@ Name: nagios Version: 2.0 -Release: 0.1.rc2%{?dist} +Release: 0.2.rc2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -11,11 +11,11 @@ Source2: nagios.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gd-devel > 1.8 +BuildRequires: gd-devel > 1.8, mailx Requires: httpd Requires(pre): %{_sbindir}/useradd -Requires(preun): /sbin/service /sbin/chkconfig -Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/usermod +Requires(preun): /sbin/service, /sbin/chkconfig +Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod Requires(postun): /sbin/service %description @@ -79,6 +79,7 @@ -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/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 +%{__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 @@ -95,7 +96,7 @@ %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers %{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h -%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf +%{__install} -D -m 0644 %{name}.htaccess %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf %{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name} %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives @@ -153,6 +154,10 @@ %{_includedir}/%{name} %changelog +* Sat Feb 04 2006 Mike McGrath 2.0-0.2.rc2 +- Fixed default options in Apache config +- Fixed %{_libdir} in Apache config for x86_64 machines + * Fri Jan 27 2006 Mike McGrath 2.0-0.1.rc2 - Using 2.0rc2 tarball From fedora-extras-commits at redhat.com Sat Feb 4 22:55:40 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 4 Feb 2006 17:55:40 -0500 Subject: rpms/nagios/FC-4 nagios.htaccess,1.1,1.2 nagios.spec,1.4,1.5 Message-ID: <200602042256.k14MuDAg022884@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22865 Modified Files: nagios.htaccess nagios.spec Log Message: Fixes in apache config for x86_64 machines Index: nagios.htaccess =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.htaccess,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nagios.htaccess 27 Jan 2006 20:48:02 -0000 1.1 +++ nagios.htaccess 4 Feb 2006 22:55:40 -0000 1.2 @@ -4,6 +4,7 @@ order deny,allow deny from all allow from 127.0.0.1 + require valid-user Alias /nagios/ /usr/share/nagios/html/ @@ -12,6 +13,7 @@ order deny,allow deny from all allow from 127.0.0.1 + require valid-user # For SSL-servers @@ -22,11 +24,9 @@ # order deny,allow # deny from all # AuthType Basic -# AuthUserFile /site/cfg/passwd -# AuthGroupFile /site/cfg/group +# AuthUserFile /etc/nagios/passwd # AuthName "nagios" -# require group nagios -# Satisfy Any +# require valid-user # # #Alias /nagios/ /usr/share/nagios/html/ @@ -36,10 +36,8 @@ # order deny,allow # deny from all # AuthType Basic -# AuthUserFile /site/cfg/passwd -# AuthGroupFile /site/cfg/group +# AuthUserFile /etc/nagios/passwd # AuthName "nagios" -# require group nagios -# Satisfy Any +# require valid-user # Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nagios.spec 27 Jan 2006 20:48:02 -0000 1.4 +++ nagios.spec 4 Feb 2006 22:55:40 -0000 1.5 @@ -1,6 +1,6 @@ Name: nagios Version: 2.0 -Release: 0.1.rc2%{?dist} +Release: 0.2.rc2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -11,11 +11,11 @@ Source2: nagios.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gd-devel > 1.8 +BuildRequires: gd-devel > 1.8, mailx Requires: httpd Requires(pre): %{_sbindir}/useradd -Requires(preun): /sbin/service /sbin/chkconfig -Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/usermod +Requires(preun): /sbin/service, /sbin/chkconfig +Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod Requires(postun): /sbin/service %description @@ -79,6 +79,7 @@ -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/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 +%{__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 @@ -95,7 +96,7 @@ %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers %{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h -%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf +%{__install} -D -m 0644 %{name}.htaccess %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf %{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name} %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives @@ -153,6 +154,10 @@ %{_includedir}/%{name} %changelog +* Sat Feb 04 2006 Mike McGrath 2.0-0.2.rc2 +- Fixed default options in Apache config +- Fixed %{_libdir} in Apache config for x86_64 machines + * Fri Jan 27 2006 Mike McGrath 2.0-0.1.rc2 - Using 2.0rc2 tarball From fedora-extras-commits at redhat.com Sat Feb 4 23:02:00 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 18:02:00 -0500 Subject: rpms/python-json/devel python-json.spec,1.1,1.2 Message-ID: <200602042302.k14N2Wfr024720@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-json/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24694 Modified Files: python-json.spec Log Message: Disttag Index: python-json.spec =================================================================== RCS file: /cvs/extras/rpms/python-json/devel/python-json.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-json.spec 4 Feb 2006 21:25:44 -0000 1.1 +++ python-json.spec 4 Feb 2006 23:02:00 -0000 1.2 @@ -5,7 +5,7 @@ Name: python-json Version: 3.4 %define version_munge %(sed 's/\\./_/g' <<< %{version}) -Release: 1 +Release: 1%{?dist} Summary: A JSON reader and writer for Python Group: Development/Languages From fedora-extras-commits at redhat.com Sat Feb 4 23:15:45 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 4 Feb 2006 18:15:45 -0500 Subject: rpms/gajim/FC-4 .cvsignore, 1.4, 1.5 gajim.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200602042316.k14NGHlN024864@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24820 Modified Files: .cvsignore gajim.spec sources Log Message: update to 0.9.1 (Eric Tanguy, #176614) and drop aplay.patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Sep 2005 20:40:53 -0000 1.4 +++ .cvsignore 4 Feb 2006 23:15:44 -0000 1.5 @@ -1 +1 @@ -gajim-0.8.2.tar.bz2 +gajim-0.9.1.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/gajim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gajim.spec 6 Sep 2005 20:40:53 -0000 1.6 +++ gajim.spec 4 Feb 2006 23:15:45 -0000 1.7 @@ -2,7 +2,7 @@ %define use_internal_modules 0 Name: gajim -Version: 0.8.2 +Version: 0.9.1 Release: 1%{?dist} Summary: Jabber client written in PyGTK @@ -10,12 +10,12 @@ License: GPL URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -Patch0: gajim-0.8.aplay.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gtk2-devel +BuildRequires: intltool BuildRequires: pkgconfig BuildRequires: pygtk2-devel BuildRequires: python-devel @@ -28,8 +28,10 @@ %endif Requires: dbus-python -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: gnome-python2-gconf Requires: pygtk2-libglade +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: python-sqlite2 %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is @@ -39,14 +41,17 @@ %prep %setup -q -%patch0 -p1 +sed -i -e 's/install\: all/install\:/' Makefile +# gajim wants to handle executables; why? +sed -i -e '/MimeType/d' gajim.desktop.in %build make \ %if ! %{use_internal_modules} translation \ idle \ + gajim.desktop \ %endif CC="%{__cc}" \ LIBDIR="/%{_lib}" \ @@ -80,14 +85,20 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS Changelog -%{_bindir}/* +%{_bindir}/gajim +%{_bindir}/gajim-remote %{_libdir}/gajim/ %{_datadir}/applications/*gajim.desktop %{_datadir}/gajim/ %{_datadir}/pixmaps/gajim* -%{_mandir}/man1/gajim* +%{_mandir}/man1/gajim.1* +%{_mandir}/man1/gajim-remote.1* %changelog +* Sat Feb 4 2006 Dawid Gajownik - 0.9.1-1 +- update to 0.9.1 (Eric Tanguy, #176614) +- drop aplay.patch + * Tue Sep 6 2005 Dawid Gajownik - 0.8.2-1 - new version 0.8.2 - remove patches .cflags, .po, .x86_64, .remote (pushed upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Sep 2005 20:40:53 -0000 1.4 +++ sources 4 Feb 2006 23:15:45 -0000 1.5 @@ -1 +1 @@ -14b00f8ed7d84d90793782db7df40ec1 gajim-0.8.2.tar.bz2 +ca82dfb7ab5c51984357ea7bab0e99af gajim-0.9.1.tar.bz2 From fedora-extras-commits at redhat.com Sat Feb 4 23:19:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 4 Feb 2006 18:19:23 -0500 Subject: rpms/gajim/FC-4 gajim-0.8.aplay.patch,1.1,NONE Message-ID: <200602042319.k14NJPKd024900@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24891 Removed Files: gajim-0.8.aplay.patch Log Message: Remove gajim-0.8.aplay.patch --- gajim-0.8.aplay.patch DELETED --- From fedora-extras-commits at redhat.com Sat Feb 4 23:31:24 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 18:31:24 -0500 Subject: rpms/python-TestGears/devel python-TestGears.spec,1.1,1.2 Message-ID: <200602042331.k14NVuTi024943@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-TestGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24926 Modified Files: python-TestGears.spec Log Message: Disttag Index: python-TestGears.spec =================================================================== RCS file: /cvs/extras/rpms/python-TestGears/devel/python-TestGears.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-TestGears.spec 4 Feb 2006 21:28:39 -0000 1.1 +++ python-TestGears.spec 4 Feb 2006 23:31:23 -0000 1.2 @@ -4,7 +4,7 @@ Name: python-TestGears Version: 0.2 -Release: 1 +Release: 1%{dist} Summary: Unit testing for Python Group: Development/Languages From fedora-extras-commits at redhat.com Sat Feb 4 23:43:16 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 4 Feb 2006 18:43:16 -0500 Subject: owners owners.list,1.607,1.608 Message-ID: <200602042343.k14NhmkY025031@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25014 Modified Files: owners.list Log Message: python-json python-TestGears Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.607 retrieving revision 1.608 diff -u -r1.607 -r1.608 --- owners.list 4 Feb 2006 16:49:22 -0000 1.607 +++ owners.list 4 Feb 2006 23:43:16 -0000 1.608 @@ -1071,6 +1071,7 @@ Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-imaging|Python's own image processing library|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|python-json|A JSON reader and writer for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-kid|A simple and pythonic XML template language|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org| @@ -1089,6 +1090,7 @@ 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| +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|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Feb 5 00:09:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:09:50 -0500 Subject: rpms/freealut - New directory Message-ID: <200602050009.k1509qUw026919@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26911/freealut Log Message: Directory /cvs/extras/rpms/freealut added to the repository From fedora-extras-commits at redhat.com Sun Feb 5 00:09:59 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:09:59 -0500 Subject: rpms/freealut/devel - New directory Message-ID: <200602050010.k150A1OM026935@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26911/freealut/devel Log Message: Directory /cvs/extras/rpms/freealut/devel added to the repository From fedora-extras-commits at redhat.com Sun Feb 5 00:10:55 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:10:55 -0500 Subject: rpms/freealut Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602050010.k150AvWa026973@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26959 Added Files: Makefile import.log Log Message: Setup of module freealut --- NEW FILE Makefile --- # Top level Makefile for module freealut all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 5 00:11:14 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:11:14 -0500 Subject: rpms/freealut/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602050011.k150BG5n026996@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26959/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module freealut --- NEW 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 Feb 5 00:13:40 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:13:40 -0500 Subject: rpms/freealut import.log,1.1,1.2 Message-ID: <200602050014.k150EC4l027082@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27046 Modified Files: import.log Log Message: auto-import freealut-1.0.0-1 on branch devel from freealut-1.0.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freealut/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Feb 2006 00:10:55 -0000 1.1 +++ import.log 5 Feb 2006 00:13:40 -0000 1.2 @@ -0,0 +1 @@ +freealut-1_0_0-1:HEAD:freealut-1.0.0-1.src.rpm:1139098392 From fedora-extras-commits at redhat.com Sun Feb 5 00:14:01 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:14:01 -0500 Subject: rpms/freealut/devel freealut.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602050014.k150EX61027090@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27046/devel Modified Files: .cvsignore sources Added Files: freealut.spec Log Message: auto-import freealut-1.0.0-1 on branch devel from freealut-1.0.0-1.src.rpm --- NEW FILE freealut.spec --- Name: freealut Version: 1.0.0 Release: 1%{?dist} Summary: Implementation of OpenAL's ALUT standard Group: System Environment/Libraries License: GPL URL: http://openal.org/ Source0: http://openal.org/openal_webstf/downloads/freealut-1.0.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openal-devel %description freealut is a free implementation of OpenAL's ALUT standard. See the file AUTHORS for the people involved. %package devel Summary: Development files for freealut Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: openal-devel %description devel Development headers and libraries needed for freealut development %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/libalut.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}/libalut.so.* %files devel %defattr(-,root,root,-) %doc doc/* %{_bindir}/freealut-config %{_includedir}/AL %{_libdir}/libalut.so %{_libdir}/pkgconfig/freealut.pc %changelog * Sat Feb 04 2006 Andreas Bierfert 1.0.0-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freealut/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2006 00:11:13 -0000 1.1 +++ .cvsignore 5 Feb 2006 00:14:01 -0000 1.2 @@ -0,0 +1 @@ +freealut-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/freealut/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2006 00:11:13 -0000 1.1 +++ sources 5 Feb 2006 00:14:01 -0000 1.2 @@ -0,0 +1 @@ +d833e5989bb19e97fca681de869d3cb2 freealut-1.0.0.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 00:26:10 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:26:10 -0500 Subject: rpms/freealut/devel freealut.spec,1.1,1.2 Message-ID: <200602050026.k150QhXj027335@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27307 Modified Files: freealut.spec Log Message: - add examples to devel doc Index: freealut.spec =================================================================== RCS file: /cvs/extras/rpms/freealut/devel/freealut.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freealut.spec 5 Feb 2006 00:14:01 -0000 1.1 +++ freealut.spec 5 Feb 2006 00:26:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: freealut Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implementation of OpenAL's ALUT standard Group: System Environment/Libraries @@ -51,13 +51,17 @@ %files devel %defattr(-,root,root,-) -%doc doc/* +%doc doc/* examples/*.c %{_bindir}/freealut-config %{_includedir}/AL %{_libdir}/libalut.so %{_libdir}/pkgconfig/freealut.pc %changelog +* Sun Feb 05 2006 Andreas Bierfert +1.0.0-2 +- Add examples to devel doc + * Sat Feb 04 2006 Andreas Bierfert 1.0.0-1 - Initial release From fedora-extras-commits at redhat.com Sun Feb 5 00:34:36 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:34:36 -0500 Subject: rpms/libopensync-plugin-irmc - New directory Message-ID: <200602050034.k150YcsD027454@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-irmc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27446/libopensync-plugin-irmc Log Message: Directory /cvs/extras/rpms/libopensync-plugin-irmc added to the repository From fedora-extras-commits at redhat.com Sun Feb 5 00:34:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:34:58 -0500 Subject: rpms/libopensync-plugin-irmc/devel - New directory Message-ID: <200602050035.k150Z0wU027469@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-irmc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27446/libopensync-plugin-irmc/devel Log Message: Directory /cvs/extras/rpms/libopensync-plugin-irmc/devel added to the repository From fedora-extras-commits at redhat.com Sun Feb 5 00:35:35 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:35:35 -0500 Subject: rpms/libopensync-plugin-irmc Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602050035.k150Zbmu027505@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-irmc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27493 Added Files: Makefile import.log Log Message: Setup of module libopensync-plugin-irmc --- NEW FILE Makefile --- # Top level Makefile for module libopensync-plugin-irmc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 5 00:35:41 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:35:41 -0500 Subject: rpms/libopensync-plugin-irmc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602050035.k150ZifQ027523@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-irmc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27493/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libopensync-plugin-irmc --- NEW 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 Feb 5 00:37:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:37:08 -0500 Subject: rpms/libopensync-plugin-irmc import.log,1.1,1.2 Message-ID: <200602050037.k150bffQ027593@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-irmc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27559 Modified Files: import.log Log Message: auto-import libopensync-plugin-irmc-0.18-3 on branch devel from libopensync-plugin-irmc-0.18-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Feb 2006 00:35:35 -0000 1.1 +++ import.log 5 Feb 2006 00:37:08 -0000 1.2 @@ -0,0 +1 @@ +libopensync-plugin-irmc-0_18-3:HEAD:libopensync-plugin-irmc-0.18-3.src.rpm:1139099802 From fedora-extras-commits at redhat.com Sun Feb 5 00:37:14 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:37:14 -0500 Subject: rpms/libopensync-plugin-irmc/devel libopensync-plugin-irmc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602050037.k150blT4027597@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-irmc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27559/devel Modified Files: .cvsignore sources Added Files: libopensync-plugin-irmc.spec Log Message: auto-import libopensync-plugin-irmc-0.18-3 on branch devel from libopensync-plugin-irmc-0.18-3.src.rpm --- NEW FILE libopensync-plugin-irmc.spec --- Name: libopensync-plugin-irmc Version: 0.18 Release: 3 Summary: Irmc plugin for libopensync Group: System Environment/Libraries License: GPL URL: http://www.opensync.org # see http://www.opensync.org/wiki/download Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel BuildRequires: bluez-libs-devel BuildRequires: openobex-devel %description %{summary} %prep %setup -q %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 {} \; %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING ChangeLog %{_libdir}/opensync/plugins/irmc_sync.so %{_datadir}/opensync/defaults/irmc-sync %changelog * Sat Feb 04 2006 Andreas Bierfert 0.18-3 - drop zero-length docs * Sun Jan 29 2006 Andreas Bierfert 0.18-2 - added missing BR * Fri Nov 25 2005 Andreas Bierfert 0.18-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2006 00:35:41 -0000 1.1 +++ .cvsignore 5 Feb 2006 00:37:14 -0000 1.2 @@ -0,0 +1 @@ +libopensync-plugin-irmc-0.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2006 00:35:41 -0000 1.1 +++ sources 5 Feb 2006 00:37:14 -0000 1.2 @@ -0,0 +1 @@ +52f86db50d653f5af0adefeb76cf9a31 libopensync-plugin-irmc-0.18.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 00:51:05 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 19:51:05 -0500 Subject: rpms/libopensync-plugin-irmc/devel libopensync-plugin-irmc.spec, 1.1, 1.2 Message-ID: <200602050051.k150pbXp027692@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-irmc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27652 Modified Files: libopensync-plugin-irmc.spec Log Message: - add dist Index: libopensync-plugin-irmc.spec =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-irmc/devel/libopensync-plugin-irmc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libopensync-plugin-irmc.spec 5 Feb 2006 00:37:14 -0000 1.1 +++ libopensync-plugin-irmc.spec 5 Feb 2006 00:51:05 -0000 1.2 @@ -1,6 +1,6 @@ Name: libopensync-plugin-irmc Version: 0.18 -Release: 3 +Release: 4%{?dist} Summary: Irmc plugin for libopensync Group: System Environment/Libraries @@ -45,6 +45,9 @@ %{_datadir}/opensync/defaults/irmc-sync %changelog +* Sun Feb 05 2006 Andreas Bierfert 0.18-4 +- add dist + * Sat Feb 04 2006 Andreas Bierfert 0.18-3 - drop zero-length docs From fedora-extras-commits at redhat.com Sun Feb 5 01:01:17 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 20:01:17 -0500 Subject: rpms/openal/FC-4 openal-pkgconfig.patch, 1.2, 1.3 openal.spec, 1.14, 1.15 Message-ID: <200602050101.k1511oft029565@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27752/FC-4 Modified Files: openal-pkgconfig.patch openal.spec Log Message: - new pkg-config patch openal-pkgconfig.patch: Index: openal-pkgconfig.patch =================================================================== RCS file: /cvs/extras/rpms/openal/FC-4/openal-pkgconfig.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openal-pkgconfig.patch 4 Feb 2006 13:00:58 -0000 1.2 +++ openal-pkgconfig.patch 5 Feb 2006 01:01:17 -0000 1.3 @@ -1,11 +1,13 @@ ---- admin/pkgconfig/openal.pc.in.orig 2006-02-04 13:11:55.000000000 +0100 -+++ admin/pkgconfig/openal.pc.in 2006-02-04 13:12:14.000000000 +0100 -@@ -5,7 +5,7 @@ +--- admin/pkgconfig/openal.pc.in.orig 2006-02-05 01:54:57.000000000 +0100 ++++ admin/pkgconfig/openal.pc.in 2006-02-05 01:55:18.000000000 +0100 +@@ -5,8 +5,8 @@ Name: OpenAL Description: OpenAL is a cross-platform 3D audio API. -Requires: @requirements@ +Requires: Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lopenal +-Libs: -L${libdir} -lopenal ++Libs: -L${libdir} -lopenal -lpthread Cflags: -I${includedir} + Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- openal.spec 4 Feb 2006 13:00:58 -0000 1.14 +++ openal.spec 5 Feb 2006 01:01:17 -0000 1.15 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.1.20060204%{?dist} +Release: 0.2.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -98,6 +98,15 @@ %changelog +* Sun Feb 05 2006 Andreas Bierfert +0.0.9-0.2.20060204 +- pkgconfig should include pthread + +* Sat Feb 04 2006 Andreas Bierfert +0.0.9-0.1.20060204 +- switch to cvs again (suggested by upstream) + + * Thu Jan 19 2006 Andreas Bierfert 0.0.8-2 - switch to non cvs sources From fedora-extras-commits at redhat.com Sun Feb 5 01:01:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 20:01:25 -0500 Subject: rpms/openal/devel openal-pkgconfig.patch, 1.2, 1.3 openal.spec, 1.13, 1.14 Message-ID: <200602050101.k1511vGZ029584@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27752/devel Modified Files: openal-pkgconfig.patch openal.spec Log Message: - new pkg-config patch openal-pkgconfig.patch: Index: openal-pkgconfig.patch =================================================================== RCS file: /cvs/extras/rpms/openal/devel/openal-pkgconfig.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openal-pkgconfig.patch 4 Feb 2006 13:01:04 -0000 1.2 +++ openal-pkgconfig.patch 5 Feb 2006 01:01:24 -0000 1.3 @@ -1,11 +1,13 @@ ---- admin/pkgconfig/openal.pc.in.orig 2006-02-04 13:11:55.000000000 +0100 -+++ admin/pkgconfig/openal.pc.in 2006-02-04 13:12:14.000000000 +0100 -@@ -5,7 +5,7 @@ +--- admin/pkgconfig/openal.pc.in.orig 2006-02-05 01:54:57.000000000 +0100 ++++ admin/pkgconfig/openal.pc.in 2006-02-05 01:55:18.000000000 +0100 +@@ -5,8 +5,8 @@ Name: OpenAL Description: OpenAL is a cross-platform 3D audio API. -Requires: @requirements@ +Requires: Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lopenal +-Libs: -L${libdir} -lopenal ++Libs: -L${libdir} -lopenal -lpthread Cflags: -I${includedir} + Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- openal.spec 4 Feb 2006 13:01:04 -0000 1.13 +++ openal.spec 5 Feb 2006 01:01:24 -0000 1.14 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.1.20060204%{?dist} +Release: 0.2.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -98,6 +98,15 @@ %changelog +* Sun Feb 05 2006 Andreas Bierfert +0.0.9-0.2.20060204 +- pkgconfig should include pthread + +* Sat Feb 04 2006 Andreas Bierfert +0.0.9-0.1.20060204 +- switch to cvs again (suggested by upstream) + + * Thu Jan 19 2006 Andreas Bierfert 0.0.8-2 - switch to non cvs sources From fedora-extras-commits at redhat.com Sun Feb 5 01:01:06 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 20:01:06 -0500 Subject: rpms/openal/FC-3 openal-pkgconfig.patch, 1.2, 1.3 openal.spec, 1.9, 1.10 Message-ID: <200602050101.k1511oea029566@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27752/FC-3 Modified Files: openal-pkgconfig.patch openal.spec Log Message: - new pkg-config patch openal-pkgconfig.patch: Index: openal-pkgconfig.patch =================================================================== RCS file: /cvs/extras/rpms/openal/FC-3/openal-pkgconfig.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openal-pkgconfig.patch 4 Feb 2006 13:00:52 -0000 1.2 +++ openal-pkgconfig.patch 5 Feb 2006 01:01:05 -0000 1.3 @@ -1,11 +1,13 @@ ---- admin/pkgconfig/openal.pc.in.orig 2006-02-04 13:11:55.000000000 +0100 -+++ admin/pkgconfig/openal.pc.in 2006-02-04 13:12:14.000000000 +0100 -@@ -5,7 +5,7 @@ +--- admin/pkgconfig/openal.pc.in.orig 2006-02-05 01:54:57.000000000 +0100 ++++ admin/pkgconfig/openal.pc.in 2006-02-05 01:55:18.000000000 +0100 +@@ -5,8 +5,8 @@ Name: OpenAL Description: OpenAL is a cross-platform 3D audio API. -Requires: @requirements@ +Requires: Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lopenal +-Libs: -L${libdir} -lopenal ++Libs: -L${libdir} -lopenal -lpthread Cflags: -I${includedir} + Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/FC-3/openal.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- openal.spec 4 Feb 2006 13:00:52 -0000 1.9 +++ openal.spec 5 Feb 2006 01:01:05 -0000 1.10 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.1.20060204%{?dist} +Release: 0.2.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -98,6 +98,15 @@ %changelog +* Sun Feb 05 2006 Andreas Bierfert +0.0.9-0.2.20060204 +- pkgconfig should include pthread + +* Sat Feb 04 2006 Andreas Bierfert +0.0.9-0.1.20060204 +- switch to cvs again (suggested by upstream) + + * Thu Jan 19 2006 Andreas Bierfert 0.0.8-2 - switch to non cvs sources From fedora-extras-commits at redhat.com Sun Feb 5 01:20:11 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 20:20:11 -0500 Subject: rpms/freealut/devel freealut-openal.patch, NONE, 1.1 freealut.spec, 1.2, 1.3 Message-ID: <200602050120.k151KiDO029729@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29689 Modified Files: freealut.spec Added Files: freealut-openal.patch Log Message: - Fix compile with openal freealut-openal.patch: --- NEW FILE freealut-openal.patch --- --- configure.ac.orig 2006-02-05 01:48:05.000000000 +0100 +++ configure.ac 2006-02-05 01:46:52.000000000 +0100 @@ -35,8 +35,11 @@ # Checks for libraries. (not perfect yet) AC_SEARCH_LIBS([pthread_self], [pthread]) -AC_SEARCH_LIBS([alGetError], [openal32 openal]) + +PKG_CHECK_MODULES(openal,openal) +AC_SUBST(openal_CFLAGS) +AC_SUBST(openal_LIBS) ################################################################################ # Checks for header files. ################################################################################ --- examples/Makefile.am.orig 2006-02-05 01:49:09.000000000 +0100 +++ examples/Makefile.am 2006-02-05 01:50:40.000000000 +0100 @@ -1,8 +1,11 @@ +OPENAL_LIBS = @openal_LIBS@ +OPENAL_CFLAGS = @openal_CFLAGS@ + # Build, but do not install the following test programs: noinst_PROGRAMS = hello_world playfile # We need to link against our *own* libalut. -LDADD = ../src/libalut.la +LDADD = ../src/libalut.la $(OPENAL_LIBS) # Specifying the following path is needed to find . -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include $(OPENAL_CFLAGS) --- test_suite/Makefile.am.orig 2006-02-05 02:08:56.000000000 +0100 +++ test_suite/Makefile.am 2006-02-05 02:10:13.000000000 +0100 @@ -1,3 +1,6 @@ +OPENAL_LIBS = @openal_LIBS@ +OPENAL_CFLAGS = @openal_CFLAGS@ + # The following files should be in our source distribution in addition to the # standard ones included by automake itself: EXTRA_DIST = \ @@ -15,10 +18,10 @@ test_waveforms # We need to link against our *own* libalut. -LDADD = ../src/libalut.la +LDADD = ../src/libalut.la $(OPENAL_LIBS) # Specifying the following path is needed to find . -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include $(OPENAL_CFLAGS) # test_retrostuff tests deprecated functions, but we don't want to get compiler # warnings because of that. Index: freealut.spec =================================================================== RCS file: /cvs/extras/rpms/freealut/devel/freealut.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- freealut.spec 5 Feb 2006 00:26:10 -0000 1.2 +++ freealut.spec 5 Feb 2006 01:20:11 -0000 1.3 @@ -7,6 +7,7 @@ License: GPL URL: http://openal.org/ Source0: http://openal.org/openal_webstf/downloads/freealut-1.0.0.tar.gz +Patch0: freealut-openal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openal-devel @@ -27,6 +28,7 @@ %prep %setup -q +%patch0 %build %configure --disable-static @@ -61,6 +63,7 @@ * Sun Feb 05 2006 Andreas Bierfert 1.0.0-2 - Add examples to devel doc +- Fix openal linking * Sat Feb 04 2006 Andreas Bierfert 1.0.0-1 From fedora-extras-commits at redhat.com Sun Feb 5 01:20:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 20:20:26 -0500 Subject: owners owners.list,1.608,1.609 Message-ID: <200602050120.k151Kxf2029732@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29693 Modified Files: owners.list Log Message: - add freealut - add libopensync-plugin-irmc Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.608 retrieving revision 1.609 diff -u -r1.608 -r1.609 --- owners.list 4 Feb 2006 23:43:16 -0000 1.608 +++ owners.list 5 Feb 2006 01:20:26 -0000 1.609 @@ -236,6 +236,7 @@ Fedora Extras|fortune-mod|A program which will display a fortune|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org| Fedora Extras|fpc|Free Pascal Compiler|joost at cnoc.nl|extras-qa at fedoraproject.org| Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| +Fedora Extras|freealut|Implementation of OpenAL's ALUT standard|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| @@ -548,6 +549,7 @@ Fedora Extras|libopensync|A synchronization framework|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-evolution2|Evolution 2 plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-file|File plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|libopensync-plugin-irmc|Irmc plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-palm|Palm plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-python|Python plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Feb 5 01:43:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 20:43:08 -0500 Subject: rpms/freealut/devel freealut-pkconfig.patch, NONE, 1.1 freealut.spec, 1.3, 1.4 Message-ID: <200602050143.k151heFo029938@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29910 Modified Files: freealut.spec Added Files: freealut-pkconfig.patch Log Message: - add pkgconfig patch freealut-pkconfig.patch: --- NEW FILE freealut-pkconfig.patch --- --- admin/pkgconfig/Makefile.am.orig 2006-02-05 02:40:22.000000000 +0100 +++ admin/pkgconfig/Makefile.am 2006-02-05 02:40:45.000000000 +0100 @@ -1,3 +1,3 @@ -pkgconfigdir = $(prefix)/lib/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = freealut.pc bin_SCRIPTS = freealut-config Index: freealut.spec =================================================================== RCS file: /cvs/extras/rpms/freealut/devel/freealut.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freealut.spec 5 Feb 2006 01:20:11 -0000 1.3 +++ freealut.spec 5 Feb 2006 01:43:07 -0000 1.4 @@ -8,6 +8,7 @@ URL: http://openal.org/ Source0: http://openal.org/openal_webstf/downloads/freealut-1.0.0.tar.gz Patch0: freealut-openal.patch +Patch1: freealut-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openal-devel @@ -29,6 +30,7 @@ %prep %setup -q %patch0 +%patch1 %build %configure --disable-static From fedora-extras-commits at redhat.com Sun Feb 5 02:08:21 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Feb 2006 21:08:21 -0500 Subject: rpms/freealut/devel freealut-pkgconfig.patch, NONE, 1.1 freealut-pkconfig.patch, 1.1, NONE Message-ID: <200602050208.k1528NIp031858@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/freealut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31846 Added Files: freealut-pkgconfig.patch Removed Files: freealut-pkconfig.patch Log Message: - fix typo :/ freealut-pkgconfig.patch: --- NEW FILE freealut-pkgconfig.patch --- --- admin/pkgconfig/Makefile.am.orig 2006-02-05 02:40:22.000000000 +0100 +++ admin/pkgconfig/Makefile.am 2006-02-05 02:40:45.000000000 +0100 @@ -1,3 +1,3 @@ -pkgconfigdir = $(prefix)/lib/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = freealut.pc bin_SCRIPTS = freealut-config --- freealut-pkconfig.patch DELETED --- From fedora-extras-commits at redhat.com Sun Feb 5 08:34:47 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sun, 5 Feb 2006 03:34:47 -0500 Subject: owners owners.list,1.609,1.610 Message-ID: <200602050835.k158ZKC9011068@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11049 Modified Files: owners.list Log Message: + mediawiki Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.609 retrieving revision 1.610 diff -u -r1.609 -r1.610 --- owners.list 5 Feb 2006 01:20:26 -0000 1.609 +++ owners.list 5 Feb 2006 08:34:46 -0000 1.610 @@ -622,6 +622,7 @@ Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| +Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|meld|Visual diff and merge tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Feb 5 08:46:50 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sun, 5 Feb 2006 03:46:50 -0500 Subject: rpms/mediawiki - New directory Message-ID: <200602050846.k158kqiE011162@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11154/mediawiki Log Message: Directory /cvs/extras/rpms/mediawiki added to the repository From fedora-extras-commits at redhat.com Sun Feb 5 08:46:55 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sun, 5 Feb 2006 03:46:55 -0500 Subject: rpms/mediawiki/devel - New directory Message-ID: <200602050846.k158kvdp011177@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11154/mediawiki/devel Log Message: Directory /cvs/extras/rpms/mediawiki/devel added to the repository From fedora-extras-commits at redhat.com Sun Feb 5 08:47:52 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sun, 5 Feb 2006 03:47:52 -0500 Subject: rpms/mediawiki Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602050847.k158lsXq011211@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11199 Added Files: Makefile import.log Log Message: Setup of module mediawiki --- NEW FILE Makefile --- # Top level Makefile for module mediawiki all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 5 08:47:57 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sun, 5 Feb 2006 03:47:57 -0500 Subject: rpms/mediawiki/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602050847.k158lx1d011231@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11199/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mediawiki --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mediawiki # $Id$ NAME := mediawiki SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Feb 5 08:54:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 5 Feb 2006 03:54:29 -0500 Subject: owners owners.list,1.610,1.611 Message-ID: <200602050855.k158t1uE011337@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11316/owners Modified Files: owners.list Log Message: taking ownership of scorched3d and bochs Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.610 retrieving revision 1.611 diff -u -r1.610 -r1.611 --- owners.list 5 Feb 2006 08:34:46 -0000 1.610 +++ owners.list 5 Feb 2006 08:54:28 -0000 1.611 @@ -82,7 +82,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|bmp|GTK2 based fork of the XMMS 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|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org| 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|bubblemon|A system monitoring dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -1171,7 +1171,7 @@ Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| -Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Feb 5 09:00:37 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sun, 5 Feb 2006 04:00:37 -0500 Subject: rpms/mediawiki import.log,1.1,1.2 Message-ID: <200602050901.k15919lO013142@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11370 Modified Files: import.log Log Message: auto-import mediawiki-1.5.6-4 on branch devel from mediawiki-1.5.6-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mediawiki/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Feb 2006 08:47:51 -0000 1.1 +++ import.log 5 Feb 2006 09:00:37 -0000 1.2 @@ -0,0 +1 @@ +mediawiki-1_5_6-4:HEAD:mediawiki-1.5.6-4.src.rpm:1139130006 From fedora-extras-commits at redhat.com Sun Feb 5 09:00:43 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Sun, 5 Feb 2006 04:00:43 -0500 Subject: rpms/mediawiki/devel mediawiki-httpd.conf, NONE, 1.1 mediawiki-install.txt, NONE, 1.1 mediawiki.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602050901.k1591FWk013152@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11370/devel Modified Files: .cvsignore sources Added Files: mediawiki-httpd.conf mediawiki-install.txt mediawiki.spec Log Message: auto-import mediawiki-1.5.6-4 on branch devel from mediawiki-1.5.6-4.src.rpm --- NEW FILE mediawiki-httpd.conf --- Alias /mediawiki /var/www/mediawiki Order deny,allow Deny from all Allow from 127.0.0.1 # Allow from .example.com Deny from all Deny from all Deny from all Deny from all --- NEW FILE mediawiki-install.txt --- After installing the RPM, you should do the following in order to configure MediaWiki: 1. Configure the necessary MySQL database. Read the following URL for some details: http://meta.wikimedia.org/wiki/MySQL_config 2. (Optional) If you wish to configure MediaWiki from another machine, edit '/etc/httpd/conf.d/mediawiki.conf' and say so. 3. Restart your web server: # /etc/init.d/httpd restart 4. Browse to http://localhost/mediawiki/config/ and fill the necessary forms. 5. Move the configuration file to the default location: # mv /var/www/mediawiki/config/LocalSettings.php /var/www/mediawiki 6. Protect the config directory against accidental writes: # chmod g-w /var/mediawiki/config Your wiki will be set up. For more information about installation, please refer to: http://meta.wikimedia.org/wiki/Help:Installation --- NEW FILE mediawiki.spec --- %define wikidir %{_var}/www/mediawiki Name: mediawiki Version: 1.5.6 Release: 4%{?dist} Summary: The PHP-based wiki software behind Wikipedia Group: Applications/Internet License: GPL URL: http://www.mediawiki.org/ Source0: http://dl.sourceforge.net/sourceforge/wikipedia/mediawiki-%{version}.tar.gz Source1: mediawiki-httpd.conf Source2: mediawiki-install.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd Requires: php >= 4.1.2 Requires: php-mysql # to make sure the "apache" group is created before mediawiki is installed Requires(pre): httpd %description MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and the other Wikimedia Foundation websites. Compared to other wikis, it has a wide range of features and support for high-traffic websites using multiple servers. Mathematics support is included in the package mediawiki-math. %package math Summary: Mathematical formula support for MediaWiki Group: Applications/Internet BuildRequires: ocaml Requires: mediawiki = %{version}-%{release} Requires: ImageMagick tetex-latex tetex-dvips %description math This package includes the support for mathematical formulas in MediaWiki. %prep %setup -q install -D -m 644 %{SOURCE2} ./INSTALL.fedora rm -rf tests includes/zhtable skins/disabled rm -f `find -name ".[ch]*"` %build cd math make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{wikidir} cp -pr config extensions images includes languages $RPM_BUILD_ROOT%{wikidir} cp -pr maintenance skins [[:lower:]]*.* $RPM_BUILD_ROOT%{wikidir} %{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl install -d $RPM_BUILD_ROOT%{_defaultdocdir}/internals cp -pr docs/* $RPM_BUILD_ROOT%{_defaultdocdir}/internals install -d $RPM_BUILD_ROOT%{wikidir}/math install math/texvc $RPM_BUILD_ROOT%{wikidir}/math install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING FAQ HISTORY README RELEASE-NOTES UPGRADE %doc INSTALL.fedora %doc %{_defaultdocdir}/internals %config(noreplace) %{_sysconfdir}/httpd/conf.d/mediawiki.conf %dir %{wikidir} %{wikidir}/[^c]*[^h] %attr(770,root,apache) %dir %{wikidir}/config %{wikidir}/config/index.php %files math %defattr(-,root,root,-) %dir %{wikidir}/math %doc math/README math/TODO %{wikidir}/math/texvc %changelog * Sat Feb 04 2006 Roozbeh Pournader - 1.5.6-4 - Use Requires(pre) instead of PreReq (Mike McGrath) * Thu Feb 02 2006 Roozbeh Pournader - 1.5.6-3 - Refactor the %%files section (Mike McGrath) - Replace "/etc" with macro - Package docs under %%{_defaultdocdir}/internals - Minor change in description * Tue Jan 31 2006 Roozbeh Pournader - 1.5.6-2 - Add %%defattr for -math subpackage - Fixed typo in description * Tue Jan 31 2006 Roozbeh Pournader - 1.5.6-1 - Update to upstream 1.5.6 * Sun Jan 15 2006 Roozbeh Pournader - 1.5.5-3 - Add PreReq for httpd, since we use the apache user - Make mediawiki-math dependencies more specific - Package documentation for mediawiki-math * Sat Jan 14 2006 Roozbeh Pournader - 1.5.5-2 - Separate math support into a subpackage * Thu Jan 12 2006 Roozbeh Pournader - 1.5.5-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2006 08:47:57 -0000 1.1 +++ .cvsignore 5 Feb 2006 09:00:43 -0000 1.2 @@ -0,0 +1 @@ +mediawiki-1.5.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2006 08:47:57 -0000 1.1 +++ sources 5 Feb 2006 09:00:43 -0000 1.2 @@ -0,0 +1 @@ +adcb318d812af2d2637374a8aadc79c1 mediawiki-1.5.6.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 10:57:05 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sun, 5 Feb 2006 05:57:05 -0500 Subject: rpms/python-sqlite2/devel python-sqlite2.spec,1.5,1.6 Message-ID: <200602051057.k15AvbWv019346@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/python-sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19329 Modified Files: python-sqlite2.spec Log Message: `make tag' does not use Epoch so we need to increase Release tag Index: python-sqlite2.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-sqlite2.spec 3 Feb 2006 00:44:11 -0000 1.5 +++ python-sqlite2.spec 5 Feb 2006 10:57:04 -0000 1.6 @@ -3,7 +3,7 @@ Name: python-sqlite2 Version: 2.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: DB-API 2.0 interface for SQLite 3.x @@ -90,7 +90,7 @@ %changelog -* Fri Feb 3 2006 Dawid Gajownik - 1:2.1.3-2 +* Sun Feb 5 2006 Dawid Gajownik - 1:2.1.3-3 - python-sqlite2 in FC-4 was downgraded -> Epoch had to be bumped. We need to do the same in development branch From fedora-extras-commits at redhat.com Sun Feb 5 12:52:47 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Sun, 5 Feb 2006 07:52:47 -0500 Subject: rpms/yumex/devel .cvsignore, 1.11, 1.12 sources, 1.14, 1.15 yumex.spec, 1.15, 1.16 Message-ID: <200602051253.k15CrJxK023439@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23418 Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Jan 2006 18:23:10 -0000 1.11 +++ .cvsignore 5 Feb 2006 12:52:46 -0000 1.12 @@ -1 +1 @@ -yumex-0.99.3.tar.gz +yumex-0.99.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 26 Jan 2006 18:23:10 -0000 1.14 +++ sources 5 Feb 2006 12:52:46 -0000 1.15 @@ -1 +1 @@ -9ed0c02ee3b77528f201a22254348c75 yumex-0.99.3.tar.gz +6e562d7422321aa3baa2c9ecedd44933 yumex-0.99.4.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- yumex.spec 26 Jan 2006 18:23:10 -0000 1.15 +++ yumex.spec 5 Feb 2006 12:52:46 -0000 1.16 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.3 +Version: 0.99.4 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,7 +65,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog -* Wed Jan 26 2006 Tim Lauridsen - 0.99.3-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 From fedora-extras-commits at redhat.com Sun Feb 5 14:05:44 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Feb 2006 09:05:44 -0500 Subject: fedora-rpmdevtools spectemplate-ruby.spec, NONE, 1.1 fedora-newrpmspec, 1.5, 1.6 fedora-rpmdevtools.spec, 1.86, 1.87 Message-ID: <200602051405.k15E5iTQ027224@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27203 Modified Files: fedora-newrpmspec fedora-rpmdevtools.spec Added Files: spectemplate-ruby.spec Log Message: * Sun Feb 5 2006 Ville Skytt?? - Add Ruby spec template (#180066, Oliver Andrich) and make newrpmspec use it for ruby-*. --- NEW FILE spectemplate-ruby.spec --- %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitedir']")} %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")} Name: Version: Release: 1%{?dist} Summary: Group: Development/Languages License: URL: Source0: BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: BuildRequires: ruby ruby-devel # %{ruby_sitelib} for noarch, %{ruby_sitearch} for non-noarch Requires: %{ruby_sitelib} Requires: %{ruby_sitearch} %description %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT %check %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc # Include files and dirs below %{ruby_sitelib} (for noarch packages) and # %{ruby_sitearch} (for arch-dependent packages) as appropriate %changelog Index: fedora-newrpmspec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-newrpmspec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-newrpmspec 6 Oct 2005 16:03:53 -0000 1.5 +++ fedora-newrpmspec 5 Feb 2006 14:05:34 -0000 1.6 @@ -62,6 +62,9 @@ [Pp]y*) spectype=python ;; + ruby-*) + spectype=ruby + ;; *) spectype=$DEFTYPE ;; Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- fedora-rpmdevtools.spec 4 Feb 2006 16:48:40 -0000 1.86 +++ fedora-rpmdevtools.spec 5 Feb 2006 14:05:34 -0000 1.87 @@ -129,6 +129,10 @@ %changelog +* Sun Feb 5 2006 Ville Skytt?? +- Add Ruby spec template (#180066, Oliver Andrich) and make newrpmspec + use it for ruby-*. + * Sat Feb 4 2006 Ville Skytt?? - 1.4-2 - Fix rpath checker tests with bash 3.1 (#178636, Enrico Scholz). From fedora-extras-commits at redhat.com Sun Feb 5 15:31:21 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 5 Feb 2006 10:31:21 -0500 Subject: rpms/barcode/devel barcode.spec,1.5,1.6 Message-ID: <200602051531.k15FVst9029238@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29221 Modified Files: barcode.spec Log Message: * Sun Feb 05 2006 Andreas Thienemann 0.98-8 - Enabled --excludedocs install Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- barcode.spec 15 Jul 2005 18:41:07 -0000 1.5 +++ barcode.spec 5 Feb 2006 15:31:21 -0000 1.6 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz @@ -46,11 +46,11 @@ rm -rf %{buildroot} %post -/sbin/install-info %{_infodir}/barcode.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/barcode.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/barcode.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/barcode.info.gz %{_infodir}/dir || : fi %files @@ -67,6 +67,9 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Sun Feb 05 2006 Andreas Thienemann 0.98-8 +- Enabled --excludedocs install + * Thu Jul 15 2005 Andreas Thienemann 0.98-7 - Switched off threaded make, as it's causing problems when rebuilding the documentation From fedora-extras-commits at redhat.com Sun Feb 5 16:33:05 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Feb 2006 11:33:05 -0500 Subject: rpms/abiword/FC-3 abiword.spec,1.32,1.33 Message-ID: <200602051633.k15GXbT1031323@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31306 Modified Files: abiword.spec Log Message: Remove redundant requires Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- abiword.spec 5 Jan 2006 15:53:23 -0000 1.32 +++ abiword.spec 5 Feb 2006 16:33:04 -0000 1.33 @@ -3,17 +3,12 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPL Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 Source11: abiword.mime -Requires: libwmf >= 0.2.8.3 -Requires: libxml2 >= 2.6.8 -Requires: aiksaurus-gtk >= 1.2.1 -Requires: libgnomedb >= 1.0.4 -Requires: enchant Requires: mathml-fonts PreReq: desktop-file-utils >= %{desktop_file_utils_version} @@ -142,6 +137,9 @@ %{_datadir}/icons/*png %changelog +* Sun Feb 05 2006 Marc Maurer - 1:2.4.2-2.fc3 +- Remove redundant requires + * Thu Jan 05 2006 Marc Maurer - 1:2.4.2-1.fc3 - Update to 2.4.2 - Update the gsf and desktop patches From fedora-extras-commits at redhat.com Sun Feb 5 16:34:49 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Feb 2006 11:34:49 -0500 Subject: rpms/abiword/FC-4 abiword.spec,1.20,1.21 Message-ID: <200602051635.k15GZMUf031379@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31331 Modified Files: abiword.spec Log Message: Remove redundant requires Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- abiword.spec 5 Jan 2006 15:29:38 -0000 1.20 +++ abiword.spec 5 Feb 2006 16:34:49 -0000 1.21 @@ -3,17 +3,12 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPL Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 Source11: abiword.mime -Requires: libwmf >= 0.2.8.3 -Requires: libxml2 >= 2.6.8 -Requires: aiksaurus-gtk >= 1.2.1 -Requires: libgnomedb >= 1.0.4 -Requires: enchant Requires: mathml-fonts PreReq: desktop-file-utils >= %{desktop_file_utils_version} @@ -141,6 +136,9 @@ %{_datadir}/icons/*png %changelog +* Sun Feb 05 2006 Marc Maurer - 1:2.4.2-2.fc4 +- Remove redundant requires + * Thu Jan 05 2006 Marc Maurer - 1:2.4.2-1.fc4 - Update to 2.4.2; - Drop the gsf patch From fedora-extras-commits at redhat.com Sun Feb 5 17:16:36 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sun, 5 Feb 2006 12:16:36 -0500 Subject: rpms/libfwbuilder/devel libfwbuilder-2.0.10-gcc4.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libfwbuilder.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200602051717.k15HH9cX000903@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv858 Modified Files: .cvsignore libfwbuilder.spec sources Added Files: libfwbuilder-2.0.10-gcc4.patch Log Message: - Update to 2.0.10 - Fixes for GCC 4.1 - Fixes for changed libresolv behaviour in FC5 libfwbuilder-2.0.10-gcc4.patch: --- NEW FILE libfwbuilder-2.0.10-gcc4.patch --- diff -uNr libfwbuilder-2.0.10-orig/src/fwbuilder/BackgroundOp.cpp libfwbuilder-2.0.10/src/fwbuilder/BackgroundOp.cpp --- libfwbuilder-2.0.10-orig/src/fwbuilder/BackgroundOp.cpp 2004-09-08 07:34:50.000000000 +0200 +++ libfwbuilder-2.0.10/src/fwbuilder/BackgroundOp.cpp 2006-01-13 17:31:51.000000000 +0100 @@ -44,6 +44,9 @@ using namespace libfwbuilder; +void *libfwbuilder::background_thread(void *args); + + BackgroundOp::BackgroundOp():running(false),connected(true) { error = NULL; diff -uNr libfwbuilder-2.0.10-orig/src/fwbuilder/dns.h libfwbuilder-2.0.10/src/fwbuilder/dns.h --- libfwbuilder-2.0.10-orig/src/fwbuilder/dns.h 2005-03-30 09:50:13.000000000 +0200 +++ libfwbuilder-2.0.10/src/fwbuilder/dns.h 2006-01-13 17:37:20.000000000 +0100 @@ -92,7 +92,7 @@ */ static void init(); - DNS::DNS(); + DNS(); /** * Finds IP adddresses of the host with given host name. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Jul 2005 16:12:12 -0000 1.4 +++ .cvsignore 5 Feb 2006 17:16:36 -0000 1.5 @@ -1 +1 @@ -libfwbuilder-2.0.8.tar.gz +libfwbuilder-2.0.10.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libfwbuilder.spec 13 Jul 2005 16:12:12 -0000 1.8 +++ libfwbuilder.spec 5 Feb 2006 17:16:36 -0000 1.9 @@ -1,11 +1,12 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 2.0.8 -Release: 1 +Version: 2.0.10 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz +Patch0: libfwbuilder-2.0.10-gcc4.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: libxslt-devel @@ -45,11 +46,29 @@ %prep %setup -q +%patch0 -p1 -b .gcc4 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -./configure --enable-auto-docdir --libdir=%{_libdir} --prefix=%{_prefix} --with-templatedir=%{_datadir}/libfwbuilder --disable-static --enable-shared +# +# configure does not pass our CXXFLAGS to the build process, +# which kind of sucks. +# There has to be a less ugly way to do this. +# +perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in + +CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection" %configure \ + --enable-auto-docdir \ + --with-templatedir=%{_datadir}/libfwbuilder \ + --disable-static \ + --enable-shared \ + --disable-dependency-tracking +# +# configure thinks we have a usable libresolv, when in fact we do +# not (according to the definiton used by libfwbuilder, that is) +# +perl -pi -e 's,#define HAVE_GOODLIBRESOLV 1,/* #undef HAVE_GOODLIBRESOLV */,' src/fwbuilder/libfwbuilder-config.h make all @@ -71,8 +90,10 @@ %changelog -* Wed Jul 13 2005 Steve Grubb 2.0.8-1 -- New upstream version +* Sun Feb 05 2006 Ralf Ertzinger 2.0.10-1 +- Update to 2.0.10 +- Fixes for GCC 4.1 +- Fixes for changed libresolv behaviour in FC5 * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - build on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Jul 2005 16:12:12 -0000 1.4 +++ sources 5 Feb 2006 17:16:36 -0000 1.5 @@ -1 +1 @@ -a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz +7f171715bd398137e832a53628642fe6 libfwbuilder-2.0.10.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 17:25:25 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sun, 5 Feb 2006 12:25:25 -0500 Subject: rpms/libfwbuilder/FC-4 .cvsignore, 1.4, 1.5 libfwbuilder.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200602051725.k15HPwjS001005@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libfwbuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv984 Modified Files: .cvsignore libfwbuilder.spec sources Log Message: - Update to 2.0.10 - Fixes for changed libresolv behaviour in FC5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Jul 2005 16:10:41 -0000 1.4 +++ .cvsignore 5 Feb 2006 17:25:25 -0000 1.5 @@ -1 +1 @@ -libfwbuilder-2.0.8.tar.gz +libfwbuilder-2.0.10.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/libfwbuilder.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libfwbuilder.spec 13 Jul 2005 16:10:41 -0000 1.8 +++ libfwbuilder.spec 5 Feb 2006 17:25:25 -0000 1.9 @@ -1,7 +1,7 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 2.0.8 -Release: 1.FC4 +Version: 2.0.10 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.fwbuilder.org/ @@ -45,11 +45,24 @@ %prep %setup -q +%patch0 -p1 -b .gcc4 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -./configure --enable-auto-docdir --libdir=%{_libdir} --prefix=%{_prefix} --with-templatedir=%{_datadir}/libfwbuilder --disable-static --enable-shared +# +# configure does not pass our CXXFLAGS to the build process, +# which kind of sucks. +# There has to be a less ugly way to do this. +# +perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in + +CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection" %configure \ + --enable-auto-docdir \ + --with-templatedir=%{_datadir}/libfwbuilder \ + --disable-static \ + --enable-shared \ + --disable-dependency-tracking make all @@ -71,8 +84,9 @@ %changelog -* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 -- New upstream version +* Sun Feb 05 2006 Ralf Ertzinger 2.0.10-1 +- Update to 2.0.10 +- Fixes for changed libresolv behaviour in FC5 * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - build on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Jul 2005 16:10:41 -0000 1.4 +++ sources 5 Feb 2006 17:25:25 -0000 1.5 @@ -1 +1 @@ -a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz +7f171715bd398137e832a53628642fe6 libfwbuilder-2.0.10.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 17:27:12 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sun, 5 Feb 2006 12:27:12 -0500 Subject: rpms/libfwbuilder/FC-4 libfwbuilder.spec,1.9,1.10 Message-ID: <200602051727.k15HRiWr001028@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libfwbuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1011 Modified Files: libfwbuilder.spec Log Message: Remove some FC-devel bits Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/libfwbuilder.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libfwbuilder.spec 5 Feb 2006 17:25:25 -0000 1.9 +++ libfwbuilder.spec 5 Feb 2006 17:27:11 -0000 1.10 @@ -57,7 +57,7 @@ # perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in -CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection" %configure \ +%configure \ --enable-auto-docdir \ --with-templatedir=%{_datadir}/libfwbuilder \ --disable-static \ @@ -86,7 +86,7 @@ %changelog * Sun Feb 05 2006 Ralf Ertzinger 2.0.10-1 - Update to 2.0.10 -- Fixes for changed libresolv behaviour in FC5 +- spec file cleanup * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - build on all arches From fedora-extras-commits at redhat.com Sun Feb 5 17:28:51 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sun, 5 Feb 2006 12:28:51 -0500 Subject: rpms/libfwbuilder/FC-4 libfwbuilder.spec,1.10,1.11 Message-ID: <200602051729.k15HTN6Y001082@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libfwbuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1063 Modified Files: libfwbuilder.spec Log Message: Remove FC-devel only tag Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/libfwbuilder.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libfwbuilder.spec 5 Feb 2006 17:27:11 -0000 1.10 +++ libfwbuilder.spec 5 Feb 2006 17:28:51 -0000 1.11 @@ -45,7 +45,6 @@ %prep %setup -q -%patch0 -p1 -b .gcc4 %build From fedora-extras-commits at redhat.com Sun Feb 5 17:40:21 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sun, 5 Feb 2006 12:40:21 -0500 Subject: rpms/epiphany-extensions/devel .cvsignore, 1.7, 1.8 epiphany-extensions.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200602051740.k15HerbV001275@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1236 Modified Files: .cvsignore epiphany-extensions.spec sources Log Message: * Sun Feb 5 2006 Christopher Aillon - 1.9.6-1 - Update to 1.9.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Jan 2006 19:49:19 -0000 1.7 +++ .cvsignore 5 Feb 2006 17:40:20 -0000 1.8 @@ -4,3 +4,4 @@ epiphany-extensions-1.8.1.tar.bz2 epiphany-extensions-1.9.3.tar.bz2 epiphany-extensions-1.9.4.tar.bz2 +epiphany-extensions-1.9.6.tar.bz2 Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- epiphany-extensions.spec 3 Jan 2006 19:49:19 -0000 1.6 +++ epiphany-extensions.spec 5 Feb 2006 17:40:20 -0000 1.7 @@ -2,7 +2,7 @@ Summary: Extensions for Epiphany, the GNOME web browser. Name: epiphany-extensions -Version: 1.9.4 +Version: 1.9.6 Release: 1 License: GPL Group: Applications/Internet @@ -39,6 +39,9 @@ %{_libdir}/epiphany %changelog +* Sun Feb 5 2006 Christopher Aillon - 1.9.6-1 +- Update to 1.9.6 + * Tue Jan 3 2006 Christopher Aillon - 1.9.4-1 - Update to 1.9.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Jan 2006 19:49:19 -0000 1.7 +++ sources 5 Feb 2006 17:40:20 -0000 1.8 @@ -1 +1 @@ -407b67286f6a18eacda5e21ae315cdf2 epiphany-extensions-1.9.4.tar.bz2 +cbd527a45057da8d7e088d1cad721fae epiphany-extensions-1.9.6.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 5 17:40:23 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sun, 5 Feb 2006 12:40:23 -0500 Subject: rpms/fwbuilder/devel .cvsignore, 1.4, 1.5 fwbuilder.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200602051740.k15HeteO001280@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1232 Modified Files: .cvsignore fwbuilder.spec sources Log Message: - Update to 2.0.10 - Spec file cleanup Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Jul 2005 16:42:53 -0000 1.4 +++ .cvsignore 5 Feb 2006 17:40:22 -0000 1.5 @@ -1,4 +1,2 @@ -fwbuilder-2.0.5.tar.gz -fwbuilder-2.0.6.tar.gz -fwbuilder-2.0.8.tar.gz fwbuilder.desktop +fwbuilder-2.0.10.tar.gz Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fwbuilder.spec 13 Jul 2005 16:42:53 -0000 1.9 +++ fwbuilder.spec 5 Feb 2006 17:40:22 -0000 1.10 @@ -1,17 +1,17 @@ Name: fwbuilder Summary: Firewall Builder -Version: 2.0.8 -Release: 1 +Version: 2.0.10 +Release: 1%dist License: GPL Group: Applications/System URL: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz -Source1: fwbuilder.desktop +Source1: fwbuilder.desktop Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 -BuildRequires: desktop-file-utils -BuildRequires: libfwbuilder-devel = 2.0.8 +BuildRequires: desktop-file-utils +BuildRequires: libfwbuilder-devel = 2.0.10 %description Firewall Builder consists of a GUI and set of policy compilers for @@ -29,7 +29,16 @@ %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -./configure --prefix=%{_prefix} --with-templatedir=%{_datadir}/fwbuilder +# +# configure does not pass our CXXFLAGS to the build process, +# which kind of sucks. +# There has to be a less ugly way to do this. +# +perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in + +CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection" %configure \ + --with-templatedir=%{_datadir}/fwbuilder \ + --disable-dependency-tracking make all %install @@ -43,9 +52,9 @@ install -c -m644 src/gui/icons/firewall.png $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder # Add menu entry -desktop-file-install --vendor system \ +desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --add-category X-Red-Hat-Base \ + --add-category X-Fedora \ %{SOURCE1} %clean @@ -159,6 +168,10 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Sun Feb 05 2006 Ralf Ertzinger 2.0.10-1 +- Update to 2.0.10 +- Spec file cleanup + * Wed Jul 13 2005 Steve Grubb 2.0.8-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Jul 2005 16:42:53 -0000 1.4 +++ sources 5 Feb 2006 17:40:22 -0000 1.5 @@ -1,2 +1,2 @@ -37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz 8047b8aabc56f1005f7e551278083922 fwbuilder.desktop +3a0946ed322df40be9814124ac7a9cfd fwbuilder-2.0.10.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 17:54:26 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sun, 5 Feb 2006 12:54:26 -0500 Subject: rpms/fwbuilder/FC-4 .cvsignore, 1.4, 1.5 fwbuilder.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200602051754.k15Hswro001457@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/fwbuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1436 Modified Files: .cvsignore fwbuilder.spec sources Log Message: - Update to 2.0.10 - Spec file cleanup Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Jul 2005 16:41:51 -0000 1.4 +++ .cvsignore 5 Feb 2006 17:54:26 -0000 1.5 @@ -1,4 +1,2 @@ -fwbuilder-2.0.5.tar.gz -fwbuilder-2.0.6.tar.gz -fwbuilder-2.0.8.tar.gz fwbuilder.desktop +fwbuilder-2.0.10.tar.gz Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/fwbuilder.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fwbuilder.spec 13 Jul 2005 16:41:51 -0000 1.9 +++ fwbuilder.spec 5 Feb 2006 17:54:26 -0000 1.10 @@ -1,17 +1,17 @@ Name: fwbuilder Summary: Firewall Builder -Version: 2.0.8 -Release: 1.FC4 +Version: 2.0.10 +Release: 1%dist License: GPL Group: Applications/System URL: http://www.fwbuilder.org/ Source: %{name}-%{version}.tar.gz -Source1: fwbuilder.desktop +Source1: fwbuilder.desktop Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 -BuildRequires: desktop-file-utils -BuildRequires: libfwbuilder-devel = 2.0.8 +BuildRequires: desktop-file-utils +BuildRequires: libfwbuilder-devel = 2.0.10 %description Firewall Builder consists of a GUI and set of policy compilers for @@ -29,7 +29,16 @@ %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -./configure --prefix=%{_prefix} --with-templatedir=%{_datadir}/fwbuilder +# +# configure does not pass our CXXFLAGS to the build process, +# which kind of sucks. +# There has to be a less ugly way to do this. +# +perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in + +%configure \ + --with-templatedir=%{_datadir}/fwbuilder \ + --disable-dependency-tracking make all %install @@ -43,9 +52,9 @@ install -c -m644 src/gui/icons/firewall.png $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder # Add menu entry -desktop-file-install --vendor system \ +desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ - --add-category X-Red-Hat-Base \ + --add-category X-Fedora \ %{SOURCE1} %clean @@ -159,7 +168,11 @@ %{_mandir}/man1/fwb_ipt.1* %changelog -* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 +* Sun Feb 05 2006 Ralf Ertzinger 2.0.10-1 +- Update to 2.0.10 +- Spec file cleanup + +* Wed Jul 13 2005 Steve Grubb 2.0.8-1 - New upstream version * Sun May 22 2005 Jeremy Katz - 2.0.6-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Jul 2005 16:41:51 -0000 1.4 +++ sources 5 Feb 2006 17:54:26 -0000 1.5 @@ -1,2 +1,2 @@ -37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz 8047b8aabc56f1005f7e551278083922 fwbuilder.desktop +3a0946ed322df40be9814124ac7a9cfd fwbuilder-2.0.10.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 18:25:15 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Feb 2006 13:25:15 -0500 Subject: fedora-rpmdevtools spectemplate-ruby.spec,1.1,1.2 Message-ID: <200602051825.k15IPFIR003454@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3435 Modified Files: spectemplate-ruby.spec Log Message: Improvements from Oliver Andrich. Index: spectemplate-ruby.spec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-ruby.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- spectemplate-ruby.spec 5 Feb 2006 14:05:34 -0000 1.1 +++ spectemplate-ruby.spec 5 Feb 2006 18:25:07 -0000 1.2 @@ -27,6 +27,7 @@ %build +export CFLAGS="$RPM_OPT_FLAGS" %install @@ -43,8 +44,10 @@ %files %defattr(-,root,root,-) %doc -# Include files and dirs below %{ruby_sitelib} (for noarch packages) and -# %{ruby_sitearch} (for arch-dependent packages) as appropriate +# For noarch packages: sitelib +%{ruby_sitelib}/* +# For arch-specific packages: sitearch +%{ruby_sitearch}/* %changelog From fedora-extras-commits at redhat.com Sun Feb 5 18:28:20 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 5 Feb 2006 13:28:20 -0500 Subject: rpms/perl-Font-TTF - New directory Message-ID: <200602051828.k15ISM7W003544@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Font-TTF In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3536/perl-Font-TTF Log Message: Directory /cvs/extras/rpms/perl-Font-TTF added to the repository From fedora-extras-commits at redhat.com Sun Feb 5 18:28:26 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 5 Feb 2006 13:28:26 -0500 Subject: rpms/perl-Font-TTF/devel - New directory Message-ID: <200602051828.k15ISSdX003565@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Font-TTF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3536/perl-Font-TTF/devel Log Message: Directory /cvs/extras/rpms/perl-Font-TTF/devel added to the repository From fedora-extras-commits at redhat.com Sun Feb 5 18:28:54 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 5 Feb 2006 13:28:54 -0500 Subject: rpms/perl-Font-TTF Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602051828.k15ISuiK003604@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Font-TTF In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3592 Added Files: Makefile import.log Log Message: Setup of module perl-Font-TTF --- NEW FILE Makefile --- # Top level Makefile for module perl-Font-TTF all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 5 18:29:01 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 5 Feb 2006 13:29:01 -0500 Subject: rpms/perl-Font-TTF/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602051829.k15IT3Qb003624@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Font-TTF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3592/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Font-TTF --- NEW 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 Feb 5 18:30:04 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 5 Feb 2006 13:30:04 -0500 Subject: rpms/perl-Font-TTF import.log,1.1,1.2 Message-ID: <200602051830.k15IUaE2003693@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Font-TTF In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3659 Modified Files: import.log Log Message: auto-import perl-Font-TTF-0.37-3.fc5 on branch devel from perl-Font-TTF-0.37-3.fc5.src.rpm initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Font-TTF/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Feb 2006 18:28:54 -0000 1.1 +++ import.log 5 Feb 2006 18:30:03 -0000 1.2 @@ -0,0 +1 @@ +perl-Font-TTF-0_37-3_fc5:HEAD:perl-Font-TTF-0.37-3.fc5.src.rpm:1139164179 From fedora-extras-commits at redhat.com Sun Feb 5 18:30:09 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 5 Feb 2006 13:30:09 -0500 Subject: rpms/perl-Font-TTF/devel perl-Font-TTF.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602051830.k15IUgPh003697@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/perl-Font-TTF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3659/devel Modified Files: .cvsignore sources Added Files: perl-Font-TTF.spec Log Message: auto-import perl-Font-TTF-0.37-3.fc5 on branch devel from perl-Font-TTF-0.37-3.fc5.src.rpm initial import --- NEW FILE perl-Font-TTF.spec --- %define cpanname Font-TTF Name: perl-%{cpanname} Version: 0.37 Release: 3%{?dist} Summary: Perl library for modifying TTF font files Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/%{cpanname}/ Source0: http://search.cpan.org/CPAN/authors/id/M/MH/MHOSKEN/%{cpanname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # The current FE perl template proposes this BuildRequires # The current FE packaging guidelines say it's forbidden # Commenting out while a consensus is reached #BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Perl module for TrueType font hacking. Supports reading, processing and writing of the following tables: GDEF, GPOS, GSUB, LTSH, OS/2, PCLT, bsln, cmap, cvt, fdsc, feat, fpgm, glyf, hdmx, head, hhea, hmtx, kern, loca, maxp, mort, name, post, prep, prop, vhea, vmtx and the reading and writing of all other table types. In short, you can do almost anything with a standard TrueType font with this module. %prep %setup -q -n %{cpanname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS="vendor" make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w %{buildroot}/* %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README.TXT %dir %{perl_vendorlib}/Font %{perl_vendorlib}/Font/TTF %{perl_vendorlib}/ttfmod.pl %{_mandir}/man3/*.3* # We really don't want to use this perl package in a Win32 env # or poke in the windows registry to resolve fonts # (upstream makefile needs to get smarter) %exclude %{perl_vendorlib}/Font/TTF/Win32.pm %changelog * Sun Feb 5 2006 Nicolas Mailhot - 0.37-3 - spec cleanups #2 * Sun Feb 5 2006 Nicolas Mailhot - 0.37-2 - spec cleanups * Sat Feb 4 2006 Nicolas Mailhot - 0.37-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Font-TTF/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Feb 2006 18:29:00 -0000 1.1 +++ .cvsignore 5 Feb 2006 18:30:09 -0000 1.2 @@ -0,0 +1 @@ +Font-TTF-0.37.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Font-TTF/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Feb 2006 18:29:00 -0000 1.1 +++ sources 5 Feb 2006 18:30:09 -0000 1.2 @@ -0,0 +1 @@ +707231254b45c52889bf47396d77e666 Font-TTF-0.37.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 18:36:16 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 5 Feb 2006 13:36:16 -0500 Subject: owners owners.list,1.611,1.612 Message-ID: <200602051836.k15IamgY003761@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3744/owners Modified Files: owners.list Log Message: add perl-Font-TTF, use uniform mail form Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.611 retrieving revision 1.612 diff -u -r1.611 -r1.612 --- owners.list 5 Feb 2006 08:54:28 -0000 1.611 +++ owners.list 5 Feb 2006 18:36:16 -0000 1.612 @@ -242,7 +242,7 @@ Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|FreeWnn|Japanese input server|petersen at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|freeze|freeze/melt/fcat compression utilities|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| +Fedora Extras|freeze|freeze/melt/fcat compression utilities|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris at chrisgrau.com|extras-qa at fedoraproject.org| Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org| Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org| @@ -607,7 +607,7 @@ Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|lzo|A data compression library with very fast (de)compression|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|lzop|A real-time file compressor|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| +Fedora Extras|lzop|A real-time file compressor|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|m17n-db|m17n-lib datafiles for input and output|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|m17n-lib|multilingual text library|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -689,7 +689,7 @@ Fedora Extras|ngrep|Network layer grep tool|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|ninja|A text based Internet Relay Chat (IRC) client|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|nmh|A mail handling system with a command line interface|bressers at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|nomarch|GPLed Arc de-archiver|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| +Fedora Extras|nomarch|GPLed Arc de-archiver|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|notecase|A hierarchical note manager|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|nsd|NSD is a complete implementation of an authoritative DNS name server|paul at xtdnet.nl|extras-qa at fedoraproject.org| @@ -795,7 +795,7 @@ Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-PEM|Convert::PEM Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +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-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 @@ -838,6 +838,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-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Font-TTF|Perl interface to TrueType Font files|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -906,7 +907,7 @@ Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-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-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1431,7 +1432,7 @@ Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org| Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org| -Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| +Fedora Extras|zoo|File archiving utility with compression|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Feb 5 19:17:27 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Feb 2006 14:17:27 -0500 Subject: rpms/abiword/devel abiword.spec,1.29,1.30 Message-ID: <200602051917.k15JHxhJ005750@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5732 Modified Files: abiword.spec Log Message: Fix bug 171926 ??? abiword: %post/%postun: useless /sbin/ldconfig Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- abiword.spec 21 Jan 2006 21:36:41 -0000 1.29 +++ abiword.spec 5 Feb 2006 19:17:26 -0000 1.30 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -116,11 +116,9 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig update-desktop-database %{_datadir}/applications %postun -/sbin/ldconfig update-desktop-database %{_datadir}/applications %files @@ -136,6 +134,9 @@ %{_datadir}/icons/*png %changelog +* Sun Feb 05 2006 Marc Maurer - 1:2.4.2-5.fc5 +- bug 171926 + * Sat Jan 21 2006 Marc Maurer - 1:2.4.2-4.fc5 - Disable the PDF plugin for now, as poppler doesn't ship the xpdf headers anymore From fedora-extras-commits at redhat.com Sun Feb 5 20:08:58 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Feb 2006 15:08:58 -0500 Subject: rpms/gtkmathview/devel gtkmathview.spec,1.4,1.5 Message-ID: <200602052009.k15K9Vp2007853@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/gtkmathview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7835 Modified Files: gtkmathview.spec Log Message: - Omit static libs - s/gtkmathview/%{name} Index: gtkmathview.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gtkmathview.spec 11 Dec 2005 18:33:20 -0000 1.4 +++ gtkmathview.spec 5 Feb 2006 20:08:58 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A MathML rendering library Name: gtkmathview Version: 0.7.6 -Release: 1 +Release: 2%{?dist} Group: System Environment/Libraries License: GPL Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz @@ -21,7 +21,7 @@ %package devel Summary: Support files necessary to compile applications using gtkmathview Group: Development/Libraries -Requires: gtkmathview = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: glib2-devel >= 2.2.1 Requires: gtk2-devel >= 2.2.1 Requires: libxml2-devel >= 2.6.7 @@ -34,7 +34,7 @@ %setup -q %build -%configure +%configure --disable-static make %{?_smp_mflags} %install @@ -54,7 +54,6 @@ %files devel %defattr(-,root,root) -%{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/mathview-core.pc %{_libdir}/pkgconfig/mathview-frontend-libxml2.pc @@ -75,6 +74,11 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Feb 05 2006 Marc Maurer - 0.7.6-2.fc5 +- Use %%{?dist} in the release name +- Omit static libs (part of bug 171971) +- s/gtkmathview/%%{name} (part of bug 171971) + * Sun Dec 11 2005 Marc Maurer - 0.7.6-1 - Update to 0.7.6 From fedora-extras-commits at redhat.com Sun Feb 5 20:22:28 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Feb 2006 15:22:28 -0500 Subject: owners owners.list,1.612,1.613 Message-ID: <200602052023.k15KN0mW008117@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8068 Modified Files: owners.list Log Message: Take ownership of meld Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.612 retrieving revision 1.613 diff -u -r1.612 -r1.613 --- owners.list 5 Feb 2006 18:36:16 -0000 1.612 +++ owners.list 5 Feb 2006 20:22:28 -0000 1.613 @@ -623,7 +623,7 @@ 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| -Fedora Extras|meld|Visual diff and merge tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Feb 5 20:51:32 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Feb 2006 15:51:32 -0500 Subject: rpms/cvs2cl/devel cvs2cl.spec,1.9,1.10 Message-ID: <200602052052.k15Kq5wi008486@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/cvs2cl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8461 Modified Files: cvs2cl.spec Log Message: * Sun Jan 15 2006 Ville Skytt?? - 2.59-3 - Don't own %{_datadir}/xml, require it instead. - Make docs and usage message refer to cvs2cl (sans .pl). Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/devel/cvs2cl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cvs2cl.spec 19 May 2005 15:34:48 -0000 1.9 +++ cvs2cl.spec 5 Feb 2006 20:51:32 -0000 1.10 @@ -1,6 +1,6 @@ Name: cvs2cl Version: 2.59 -Release: 2 +Release: 3%{?dist} Summary: Generate ChangeLogs from CVS working copies Group: Development/Tools @@ -19,6 +19,7 @@ BuildArch: noarch BuildRequires: %{_bindir}/pod2man Requires: perl +Requires: %{_datadir}/xml %description cvs2cl generates GNU-style ChangeLogs for a CVS working copy using @@ -28,6 +29,7 @@ %prep %setup -c -T +sed -e 's/cvs2cl\.pl/cvs2cl/' %{SOURCE0} > cvs2cl %build @@ -35,13 +37,13 @@ --section=1 \ --release=%{version} \ --center="CVS-log-message-to-ChangeLog conversion script" \ - %{SOURCE0} > cvs2cl.1 + cvs2cl > cvs2cl.1 %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/xml/cvs2cl,%{_mandir}/man1} -install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/cvs2cl +install -p -m 755 cvs2cl $RPM_BUILD_ROOT%{_bindir}/cvs2cl install -p -m 644 \ %{SOURCE1} \ %{SOURCE2} \ @@ -61,11 +63,15 @@ %files %defattr(-,root,root,-) %{_bindir}/cvs2cl -%{_datadir}/xml +%{_datadir}/xml/cvs2cl/ %{_mandir}/man1/cvs2cl.1* %changelog +* Sun Jan 15 2006 Ville Skytt?? - 2.59-3 +- Don't own %%{_datadir}/xml, require it instead. +- Make docs and usage message refer to cvs2cl (sans .pl). + * Thu May 19 2005 Ville Skytt?? - 2.59-2 - 2.59. From fedora-extras-commits at redhat.com Sun Feb 5 21:31:07 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Feb 2006 16:31:07 -0500 Subject: rpms/meld/devel meld-scrollkeeper.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 meld.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200602052131.k15LVdD7010707@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/meld/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10664 Modified Files: .cvsignore meld.spec sources Added Files: meld-scrollkeeper.patch Log Message: * Sun Feb 5 2006 Brian Pepple - 1.1.3-2 - Update to 1.1.3. - Update scrollkeeper scriptlet. - Update versions required for pygtk2 & gnome-python2. - Add patch to disable scrollkeeper in Makefile. - Ghost the *.pyo. meld-scrollkeeper.patch: --- NEW FILE meld-scrollkeeper.patch --- diff -ru meld-1.1.3.OLD/help/C/GNUmakefile meld-1.1.3/help/C/GNUmakefile --- meld-1.1.3.OLD/help/C/GNUmakefile 2006-01-28 16:43:57.000000000 -0500 +++ meld-1.1.3/help/C/GNUmakefile 2006-02-05 16:04:32.000000000 -0500 @@ -6,7 +6,6 @@ XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(LANG) OMF_NAME := meld-$(LANG).omf OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld -OMF_STATE:= $(DESTDIR)$(prefix)/var/lib/scrollkeeper .PHONY : all all $(OMF_NAME).install : $(OMF_NAME) @@ -18,7 +17,6 @@ install -m 644 meld.xml $(XML_DIR_)/meld.xml install -m 644 figures/*.png $(XML_DIR_)/figures -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME) - -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_) .PHONY : uninstall uninstall : @@ -27,7 +25,6 @@ $(XML_DIR_)/figures/*.png -rmdir $(XML_DIR_)/figures \ $(XML_DIR_) - -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_) .PHONY : clean clean : Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/meld/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 13 Nov 2005 09:39:53 -0000 1.7 +++ .cvsignore 5 Feb 2006 21:31:07 -0000 1.8 @@ -1 +1 @@ -meld-1.1.2.tar.bz2 +meld-1.1.3.tar.bz2 Index: meld.spec =================================================================== RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- meld.spec 17 Jan 2006 22:39:57 -0000 1.12 +++ meld.spec 5 Feb 2006 21:31:07 -0000 1.13 @@ -2,8 +2,8 @@ # spec for FC-4 differs (and could be merged) Name: meld -Version: 1.1.2 -Release: 1%{?dist} +Version: 1.1.3 +Release: 2%{?dist} Summary: Visual diff and merge tool Group: Development/Tools @@ -11,16 +11,17 @@ URL: http://meld.sourceforge.net/ Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2 Patch0: desktop.patch +Patch1: %{name}-scrollkeeper.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool BuildRequires: scrollkeeper -Requires: gnome-python2 >= 1.99.14 +Requires: gnome-python2 >= 2.6.0 Requires: gnome-python2-canvas Requires: gnome-python2-gconf -Requires: pygtk2 >= 1.99.15 +Requires: pygtk2 >= 2.6.0 Requires: pygtk2-libglade Requires(post): scrollkeeper @@ -39,6 +40,7 @@ %prep %setup -q %patch0 -p1 -b .desktop +%patch1 -p1 -b .scrollkeepe %build @@ -51,17 +53,18 @@ make prefix=%{_prefix} libdir=%{_datadir} \ DESTDIR=${RPM_BUILD_ROOT} install + desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/meld.desktop + ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %find_lang %{name} %post -scrollkeeper-update -q || : +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %postun @@ -75,16 +78,31 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING -%{_bindir}/meld -%{_datadir}/meld/ -%{_datadir}/applications/fedora-meld.desktop +%{_bindir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.py +%{_datadir}/%{name}/*.pyc +%ghost %{_datadir}/%{name}/*.pyo +%dir %{_datadir}/%{name}/vc +%{_datadir}/%{name}/vc/*.py +%{_datadir}/%{name}/vc/*.pyc +%ghost %{_datadir}/%{name}/vc/*.pyo +%{_datadir}/%{name}/glade2/ +%{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/application-registry/%{name}* -%{_datadir}/pixmaps/meld.png +%{_datadir}/pixmaps/%{name}.png %{_datadir}/gnome/help/%{name}/ %{_datadir}/omf/%{name}/ %changelog +* Sun Feb 5 2006 Brian Pepple - 1.1.3-2 +- Update to 1.1.3. +- Update scrollkeeper scriptlet. +- Update versions required for pygtk2 & gnome-python2. +- Add patch to disable scrollkeeper in Makefile. +- Ghost the *.pyo. + * Sun Nov 13 2005 Michael Schwendt - 1.1.2-1 - Update to 1.1.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/meld/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 13 Nov 2005 09:39:53 -0000 1.7 +++ sources 5 Feb 2006 21:31:07 -0000 1.8 @@ -1 +1 @@ -a00473f852c32db0bcd48c84b0f27869 meld-1.1.2.tar.bz2 +b958f6b3b5b849607d952f49eb082cba meld-1.1.3.tar.bz2 From fedora-extras-commits at redhat.com Sun Feb 5 21:31:14 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 5 Feb 2006 16:31:14 -0500 Subject: rpms/kphone/devel kphone-4.2-configure.patch, NONE, 1.1 kphone.spec, 1.21, 1.22 Message-ID: <200602052131.k15LVkSK010710@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10660 Modified Files: kphone.spec Added Files: kphone-4.2-configure.patch Log Message: use standard CFLAGS reenable STUN patch kphone-4.2-configure.patch: --- NEW FILE kphone-4.2-configure.patch --- --- kphone-orig/configure 2005-06-22 03:37:20.000000000 -0500 +++ kphone/configure 2006-02-05 15:12:33.000000000 -0600 @@ -1295,7 +1295,7 @@ echo "$ac_t""no" 1>&6 fi -CFLAGS="-I$ac_cv_qt_inc -Wall" +CFLAGS="-I$ac_cv_qt_inc $CFLAGS" LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib" ac_ext=c @@ -2145,13 +2145,6 @@ enable_debug=$debug_default fi -if test "x$enable_debug" = "xyes"; then - CFLAGS="$CFLAGS -g -DDEBUG" -echo "$ac_t""yes" 1>&6 -else -CFLAGS="$CFLAGS -O3" -echo "$ac_t""no" 1>&6 -fi ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- kphone.spec 3 Feb 2006 23:33:40 -0000 1.21 +++ kphone.spec 5 Feb 2006 21:31:14 -0000 1.22 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -13,6 +13,7 @@ Patch2: kphone-4.1.0-strip.patch Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch +Patch5: kphone-4.2-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -27,11 +28,14 @@ %setup -q -n kphone %patch1 -p1 -b .endian %patch2 -p1 -b .strip +%patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 +%patch5 -p1 -b .configure %build -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%configure +unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include +%configure make %{?_smp_mflags} %install @@ -60,6 +64,10 @@ %{_datadir}/pixmaps/*.png %changelog +* Sun Feb 05 2006 Dennis Gilmore 4.2-6 +- patch configure so we use standard CFLAGS +- reapply STUN patch + * Fri Feb 02 2006 Dennis Gilmore 4.2-5 - patch for gcc 4.1 From fedora-extras-commits at redhat.com Sun Feb 5 21:32:46 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Feb 2006 16:32:46 -0500 Subject: rpms/enchant/devel .cvsignore, 1.6, 1.7 enchant.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200602052133.k15LXJZZ010811@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10790 Modified Files: .cvsignore enchant.spec sources Log Message: Update to 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 19:27:19 -0000 1.6 +++ .cvsignore 5 Feb 2006 21:32:46 -0000 1.7 @@ -1 +1 @@ -enchant-1.2.1.tar.gz +enchant-1.2.2.tar.gz Index: enchant.spec =================================================================== RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- enchant.spec 30 Jan 2006 19:27:19 -0000 1.7 +++ enchant.spec 5 Feb 2006 21:32:46 -0000 1.8 @@ -1,6 +1,6 @@ Summary: An Enchanting Spell Checking Library Name: enchant -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Epoch: 1 Group: System Environment/Libraries @@ -61,6 +61,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Feb 05 2006 Marc Maurer 1:1.2.2-1.fc5 +- Update to 1.2.2 + * Mon Jan 30 2006 Marc Maurer 1:1.2.1-1.fc5 - Update to 1.2.1 - Drop glib Require Index: sources =================================================================== RCS file: /cvs/extras/rpms/enchant/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 19:27:19 -0000 1.6 +++ sources 5 Feb 2006 21:32:46 -0000 1.7 @@ -1 +1 @@ -841542c0bf89b5c7b8a85f4bc682f70b enchant-1.2.1.tar.gz +ee7f8261bc607015633206f710671239 enchant-1.2.2.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 21:34:36 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 5 Feb 2006 16:34:36 -0500 Subject: rpms/kphone/FC-3 kphone-4.2-configure.patch, NONE, 1.1 kphone-gcc41.patch, NONE, 1.1 kphone.spec, 1.14, 1.15 Message-ID: <200602052135.k15LZ8rI010891@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10862 Modified Files: kphone.spec Added Files: kphone-4.2-configure.patch kphone-gcc41.patch Log Message: use standard CFLAGS and reenable STUN patch kphone-4.2-configure.patch: --- NEW FILE kphone-4.2-configure.patch --- --- kphone-orig/configure 2005-06-22 03:37:20.000000000 -0500 +++ kphone/configure 2006-02-05 15:12:33.000000000 -0600 @@ -1295,7 +1295,7 @@ echo "$ac_t""no" 1>&6 fi -CFLAGS="-I$ac_cv_qt_inc -Wall" +CFLAGS="-I$ac_cv_qt_inc $CFLAGS" LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib" ac_ext=c @@ -2145,13 +2145,6 @@ enable_debug=$debug_default fi -if test "x$enable_debug" = "xyes"; then - CFLAGS="$CFLAGS -g -DDEBUG" -echo "$ac_t""yes" 1>&6 -else -CFLAGS="$CFLAGS -O3" -echo "$ac_t""no" 1>&6 -fi ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. kphone-gcc41.patch: --- NEW FILE kphone-gcc41.patch --- diff -Nur kphone-orig/kphone/kcallwidget.h kphone/kphone/kcallwidget.h --- kphone-orig/kphone/kcallwidget.h 2005-04-18 08:04:40.000000000 -0500 +++ kphone/kphone/kcallwidget.h 2006-02-03 06:58:25.000000000 -0600 @@ -67,7 +67,7 @@ void clickHangup( void ); void setHide( void ); bool isHided( void ) const { return hided; } - void KCallWidget::setDTMFSender( QString &s ); + void setDTMFSender( QString &s ); public slots: void pleaseDial( const SipUri &dialuri ); diff -Nur kphone-orig/kphone/kphoneview.h kphone/kphone/kphoneview.h --- kphone-orig/kphone/kphoneview.h 2005-04-18 08:04:40.000000000 -0500 +++ kphone/kphone/kphoneview.h 2006-02-03 06:58:58.000000000 -0600 @@ -54,7 +54,7 @@ QString getStunSrv( void ); void kphoneQuit( void ); bool getState( void ); - KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype ); + KCallWidget *DoCall( QString num, SipCall::CallType ctype ); signals: void stateChanged( void ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kphone.spec 5 Aug 2005 03:35:37 -0000 1.14 +++ kphone.spec 5 Feb 2006 21:34:36 -0000 1.15 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 2%{?dist} +Release: 6%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -12,6 +12,8 @@ Patch1: kphone-4.1.0-endian.patch Patch2: kphone-4.1.0-strip.patch Patch3: kphone-4.2-callaudio-stun-init.patch +Patch4: kphone-gcc41.patch +Patch5: kphone-4.2-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -26,10 +28,14 @@ %setup -q -n kphone %patch1 -p1 -b .endian %patch2 -p1 -b .strip +%patch3 -p1 -b .stun +%patch4 -p1 -b .gcc41 +%patch5 -p1 -b .configure %build -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%configure +unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include +%configure make %{?_smp_mflags} %install @@ -58,6 +64,19 @@ %{_datadir}/pixmaps/*.png %changelog +* Sun Feb 05 2006 Dennis Gilmore 4.2-6 +- patch configure so we use standard CFLAGS +- reapply STUN patch + +* Fri Feb 02 2006 Dennis Gilmore 4.2-5 +- patch for gcc 4.1 + +* Wed Dec 21 2005 Dennis Gilmore 4.2-4 +-rebuild for new gcc :) + +* Sat Nov 12 2005 Dennis Gilmore 4.2-3 +- Rebuild for updated openssl + * Thu Aug 04 2005 Dennis Gilmore 4.2-2%{?dist} - Remove STUN patch as it causes Segfaults on call. Will reapply when fixed. From fedora-extras-commits at redhat.com Sun Feb 5 21:35:42 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Feb 2006 16:35:42 -0500 Subject: rpms/enchant/FC-4 .cvsignore, 1.6, 1.7 enchant.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200602052136.k15LaFkv010971@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/enchant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10947 Modified Files: .cvsignore enchant.spec sources Log Message: Update to 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/enchant/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 31 Jan 2006 17:31:56 -0000 1.6 +++ .cvsignore 5 Feb 2006 21:35:42 -0000 1.7 @@ -1 +1 @@ -enchant-1.2.1.tar.gz +enchant-1.2.2.tar.gz Index: enchant.spec =================================================================== RCS file: /cvs/extras/rpms/enchant/FC-4/enchant.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- enchant.spec 31 Jan 2006 17:31:56 -0000 1.7 +++ enchant.spec 5 Feb 2006 21:35:42 -0000 1.8 @@ -1,6 +1,6 @@ Summary: An Enchanting Spell Checking Library Name: enchant -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Epoch: 1 Group: System Environment/Libraries @@ -61,6 +61,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Feb 05 2006 Marc Maurer 1:1.2.2-1.fc4 +- Update to 1.2.2 + * Mon Jan 31 2006 Marc Maurer 1:1.2.1-1.fc4 - Update to 1.2.1 - Drop glib Require Index: sources =================================================================== RCS file: /cvs/extras/rpms/enchant/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 31 Jan 2006 17:31:56 -0000 1.6 +++ sources 5 Feb 2006 21:35:42 -0000 1.7 @@ -1 +1 @@ -841542c0bf89b5c7b8a85f4bc682f70b enchant-1.2.1.tar.gz +ee7f8261bc607015633206f710671239 enchant-1.2.2.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 21:36:44 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 5 Feb 2006 16:36:44 -0500 Subject: rpms/kphone/FC-4 kphone-4.2-configure.patch, NONE, 1.1 kphone-gcc41.patch, NONE, 1.1 kphone.spec, 1.18, 1.19 Message-ID: <200602052137.k15LbG2s011041@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11008 Modified Files: kphone.spec Added Files: kphone-4.2-configure.patch kphone-gcc41.patch Log Message: use standard CFLAGS and renable STUN patch kphone-4.2-configure.patch: --- NEW FILE kphone-4.2-configure.patch --- --- kphone-orig/configure 2005-06-22 03:37:20.000000000 -0500 +++ kphone/configure 2006-02-05 15:12:33.000000000 -0600 @@ -1295,7 +1295,7 @@ echo "$ac_t""no" 1>&6 fi -CFLAGS="-I$ac_cv_qt_inc -Wall" +CFLAGS="-I$ac_cv_qt_inc $CFLAGS" LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib" ac_ext=c @@ -2145,13 +2145,6 @@ enable_debug=$debug_default fi -if test "x$enable_debug" = "xyes"; then - CFLAGS="$CFLAGS -g -DDEBUG" -echo "$ac_t""yes" 1>&6 -else -CFLAGS="$CFLAGS -O3" -echo "$ac_t""no" 1>&6 -fi ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. kphone-gcc41.patch: --- NEW FILE kphone-gcc41.patch --- diff -Nur kphone-orig/kphone/kcallwidget.h kphone/kphone/kcallwidget.h --- kphone-orig/kphone/kcallwidget.h 2005-04-18 08:04:40.000000000 -0500 +++ kphone/kphone/kcallwidget.h 2006-02-03 06:58:25.000000000 -0600 @@ -67,7 +67,7 @@ void clickHangup( void ); void setHide( void ); bool isHided( void ) const { return hided; } - void KCallWidget::setDTMFSender( QString &s ); + void setDTMFSender( QString &s ); public slots: void pleaseDial( const SipUri &dialuri ); diff -Nur kphone-orig/kphone/kphoneview.h kphone/kphone/kphoneview.h --- kphone-orig/kphone/kphoneview.h 2005-04-18 08:04:40.000000000 -0500 +++ kphone/kphone/kphoneview.h 2006-02-03 06:58:58.000000000 -0600 @@ -54,7 +54,7 @@ QString getStunSrv( void ); void kphoneQuit( void ); bool getState( void ); - KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype ); + KCallWidget *DoCall( QString num, SipCall::CallType ctype ); signals: void stateChanged( void ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- kphone.spec 5 Aug 2005 03:35:00 -0000 1.18 +++ kphone.spec 5 Feb 2006 21:36:44 -0000 1.19 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 2%{?dist} +Release: 6%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -12,6 +12,8 @@ Patch1: kphone-4.1.0-endian.patch Patch2: kphone-4.1.0-strip.patch Patch3: kphone-4.2-callaudio-stun-init.patch +Patch4: kphone-gcc41.patch +Patch5: kphone-4.2-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -26,10 +28,14 @@ %setup -q -n kphone %patch1 -p1 -b .endian %patch2 -p1 -b .strip +%patch3 -p1 -b .stun +%patch4 -p1 -b .gcc41 +%patch5 -p1 -b .configure %build -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%configure +unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include +%configure make %{?_smp_mflags} %install @@ -58,6 +64,19 @@ %{_datadir}/pixmaps/*.png %changelog +* Sun Feb 05 2006 Dennis Gilmore 4.2-6 +- patch configure so we use standard CFLAGS +- reapply STUN patch + +* Fri Feb 02 2006 Dennis Gilmore 4.2-5 +- patch for gcc 4.1 + +* Wed Dec 21 2005 Dennis Gilmore 4.2-4 +-rebuild for new gcc :) + +* Sat Nov 12 2005 Dennis Gilmore 4.2-3 +- Rebuild for updated openssl + * Thu Aug 04 2005 Dennis Gilmore 4.2-2%{?dist} - Remove STUN patch as it causes Segfaults on call. Will reapply when fixed. From fedora-extras-commits at redhat.com Sun Feb 5 21:38:57 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Feb 2006 16:38:57 -0500 Subject: rpms/enchant/FC-3 .cvsignore, 1.5, 1.6 enchant.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200602052139.k15LdT15011134@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/enchant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108 Modified Files: .cvsignore enchant.spec sources Log Message: Update to 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/enchant/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Oct 2005 00:53:55 -0000 1.5 +++ .cvsignore 5 Feb 2006 21:38:57 -0000 1.6 @@ -1 +1 @@ -enchant-1.2.0.tar.gz +enchant-1.2.2.tar.gz Index: enchant.spec =================================================================== RCS file: /cvs/extras/rpms/enchant/FC-3/enchant.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- enchant.spec 23 Oct 2005 00:53:55 -0000 1.6 +++ enchant.spec 5 Feb 2006 21:38:57 -0000 1.7 @@ -1,13 +1,12 @@ Summary: An Enchanting Spell Checking Library Name: enchant -Version: 1.2.0 +Version: 1.2.2 Release: 1%{?dist} Epoch: 1 Group: System Environment/Libraries License: LGPL Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz URL: http://www.abisource.com/ -Requires: glib2 >= 2.0.0 BuildRequires: glib2-devel >= 2.0.0 BuildRequires: aspell-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -62,6 +61,10 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sun Feb 05 2006 Marc Maurer 1:1.2.2-1.fc3 +- Update to 1.2.2 +- Drop redundant glib require + * Sat Oct 22 2005 Marc Maurer 1:1.2.0-1.fc3 - Update to 1.2.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/enchant/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Oct 2005 00:53:55 -0000 1.5 +++ sources 5 Feb 2006 21:38:57 -0000 1.6 @@ -1 +1 @@ -e44a734a85fbbadf898fb935ac346f31 enchant-1.2.0.tar.gz +ee7f8261bc607015633206f710671239 enchant-1.2.2.tar.gz From fedora-extras-commits at redhat.com Sun Feb 5 21:58:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 5 Feb 2006 16:58:44 -0500 Subject: rpms/scorched3d/devel scorched3d-64bit.patch, NONE, 1.1 scorched3d-cvs-20050929-bins.tar.gz, NONE, 1.1 scorched3d-cvs-20050929.patch, NONE, 1.1 scorched3d-gcc41.patch, NONE, 1.1 scorched3d.spec, 1.6, 1.7 Message-ID: <200602052159.k15LxG3S011281@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11252 Modified Files: scorched3d.spec Added Files: scorched3d-64bit.patch scorched3d-cvs-20050929-bins.tar.gz scorched3d-cvs-20050929.patch scorched3d-gcc41.patch Log Message: scorched3d WIP scorched3d-64bit.patch: --- NEW FILE scorched3d-64bit.patch --- diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/client/ServerBrowser.cpp ./src/client/ServerBrowser.cpp --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/client/ServerBrowser.cpp 2003-10-21 16:58:11.000000000 +0000 +++ ./src/client/ServerBrowser.cpp 2005-11-01 15:07:15.000000000 +0000 @@ -50,7 +50,7 @@ int ServerBrowser::threadFunc(void *var) { - bool lan = (bool) (int(var)==1); + bool lan = (bool) (long(var)==1); bool result = false; if (lan) result = instance_->serverList_.fetchLANList(); else result = instance_->serverList_.fetchServerList(); diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServer.cpp ./src/coms/NetServer.cpp --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServer.cpp 2005-06-10 23:24:31.000000000 +0000 +++ ./src/coms/NetServer.cpp 2005-11-02 07:07:49.000000000 +0000 @@ -235,7 +235,7 @@ itor++) { TCPsocket sock = (*itor).first; - disconnectClient((unsigned int) sock); + disconnectClient((unsigned long) sock); } SDL_UnlockMutex(setMutex_); } @@ -247,7 +247,7 @@ NetMessage *message = NetMessagePool::instance()-> getFromPool(NetMessage::DisconnectMessage, - (unsigned int) client, + (unsigned long) client, getIpAddress(client)); if (delayed) @@ -264,7 +264,7 @@ void NetServer::sendMessage(NetBuffer &buffer) { - sendMessage(buffer, (unsigned int) firstDestination_); + sendMessage(buffer, (unsigned long) firstDestination_); } void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest) @@ -276,7 +276,7 @@ // Get a new buffer from the pool NetMessage *message = NetMessagePool::instance()-> getFromPool(NetMessage::NoMessage, - (unsigned int) destination, + (unsigned long) destination, getIpAddress(destination)); // Add message to new buffer @@ -304,8 +304,8 @@ else { NetMessagePool::instance()->addToPool(message); - Logger::log( "Unknown sendMessage destination %i", - (int) client); + Logger::log( "Unknown sendMessage destination %li", + (long) client); } SDL_UnlockMutex(setMutex_); } diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServerProtocol.cpp ./src/coms/NetServerProtocol.cpp --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServerProtocol.cpp 2005-06-13 17:31:06.000000000 +0000 +++ ./src/coms/NetServerProtocol.cpp 2005-11-02 07:43:20.000000000 +0000 @@ -125,7 +125,7 @@ // allocate the buffer memory NetMessage *buffer = NetMessagePool::instance()-> getFromPool(NetMessage::BufferMessage, - (unsigned int) socket, + (unsigned long) socket, NetServer::getIpAddress(socket)); buffer->getBuffer().allocate(len); buffer->getBuffer().setBufferUsed(len); @@ -161,7 +161,7 @@ // Allocate a new buffer NetMessage *newMessage = NetMessagePool::instance()-> getFromPool(NetMessage::BufferMessage, - (unsigned int) socket, + (unsigned long) socket, NetServer::getIpAddress(socket)); NetBuffer &newBuffer = newMessage->getBuffer(); newBuffer.allocate(destLen); @@ -291,7 +291,7 @@ // allocate the buffer memory NetMessage *netBuffer = NetMessagePool::instance()-> getFromPool(NetMessage::BufferMessage, - (unsigned int) socket, + (unsigned long) socket, NetServer::getIpAddress(socket)); netBuffer->getBuffer().reset(); @@ -354,7 +354,7 @@ // allocate the buffer memory NetMessage *netBuffer = NetMessagePool::instance()-> getFromPool(NetMessage::BufferMessage, - (unsigned int) socket, + (unsigned long) socket, NetServer::getIpAddress(socket)); netBuffer->getBuffer().reset(); diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServerRead.cpp ./src/coms/NetServerRead.cpp --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServerRead.cpp 2005-06-10 23:24:31.000000000 +0000 +++ ./src/coms/NetServerRead.cpp 2005-11-02 07:44:10.000000000 +0000 @@ -64,7 +64,7 @@ // Send the player connected notification NetMessage *message = NetMessagePool::instance()-> getFromPool(NetMessage::ConnectMessage, - (unsigned int) socket_, + (unsigned long) socket_, NetServer::getIpAddress(socket_)); messageHandler_->addMessage(message); @@ -96,7 +96,7 @@ sentDisconnect_ = true; NetMessage *message = NetMessagePool::instance()-> getFromPool(NetMessage::DisconnectMessage, - (unsigned int) socket_, + (unsigned long) socket_, NetServer::getIpAddress(socket_)); messageHandler_->addMessage(message); } @@ -191,7 +191,7 @@ Logger::log( "Warning: %s net loop took %.2f seconds, client %i", (send?"Send":"Recv"), - timeDiff, (unsigned int) socket_); + timeDiff, (unsigned long) socket_); } } @@ -201,7 +201,7 @@ sentDisconnect_ = true; NetMessage *message = NetMessagePool::instance()-> getFromPool(NetMessage::DisconnectMessage, - (unsigned int) socket_, + (unsigned long) socket_, NetServer::getIpAddress(socket_)); messageHandler_->addMessage(message); } @@ -276,7 +276,7 @@ { NetMessage *notification = NetMessagePool::instance()-> getFromPool(NetMessage::SentMessage, - (unsigned int) socket_, + (unsigned long) socket_, NetServer::getIpAddress(socket_)); messageHandler_->addMessage(notification); } diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/dialogs/HelpButtonDialog.cpp ./src/dialogs/HelpButtonDialog.cpp --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/dialogs/HelpButtonDialog.cpp 2005-09-18 09:59:33.000000000 +0000 +++ ./src/dialogs/HelpButtonDialog.cpp 2005-11-01 15:07:15.000000000 +0000 @@ -160,7 +160,7 @@ void HelpButtonDialog::itemSelected(GLWSelectorEntry *entry, int position) { - int data = (int) entry->getUserData(); + long data = (long) entry->getUserData(); if (data != -1) { int volume = int(float(data) * 12.8f); diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/engine/ScorchedCollisionHandler.cpp ./src/engine/ScorchedCollisionHandler.cpp --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/engine/ScorchedCollisionHandler.cpp 2005-06-08 17:29:38.000000000 +0000 +++ ./src/engine/ScorchedCollisionHandler.cpp 2005-11-01 19:47:08.000000000 +0000 @@ -93,7 +93,7 @@ } ShotBounce *particle = (ShotBounce *) bounceInfo->data; - unsigned int id = (unsigned int) otherInfo->data; + unsigned long id = (unsigned long) otherInfo->data; // only collide with the ground, walls or landscape, // or iteself @@ -217,7 +217,7 @@ otherInfo = (ScorchedCollisionInfo *) dGeomGetData(o1); } - unsigned int id = (unsigned int) otherInfo->data; + unsigned long id = (unsigned long) otherInfo->data; ShotProjectile *shot = (ShotProjectile *) particleInfo->data; shot->incLandedCounter(); Vector particlePositionV( diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/ode/config.h ./src/ode/config.h --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/ode/config.h 2004-11-02 09:20:35.000000000 +0000 +++ ./src/ode/config.h 2005-11-01 15:07:15.000000000 +0000 @@ -81,7 +81,7 @@ /* an integer type that we can safely cast a pointer to and from without * loss of bits. */ -typedef unsigned int intP; +typedef unsigned long intP; /* if we're compiling on a pentium, we may need to know the clock rate so diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/scorched/SettingsDialog.cpp ./src/scorched/SettingsDialog.cpp --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/scorched/SettingsDialog.cpp 2005-09-22 15:14:28.000000000 +0000 +++ ./src/scorched/SettingsDialog.cpp 2005-11-02 07:48:05.000000000 +0000 @@ -748,44 +748,44 @@ // Env { - context_.setWindForce((OptionsGame::WindForce) (int) + context_.setWindForce((OptionsGame::WindForce) (long) SettingsEnv::IDC_COMBO_FORCE_CTRL->GetClientData( SettingsEnv::IDC_COMBO_FORCE_CTRL->GetSelection())); - context_.setWindType((OptionsGame::WindType) (int) + context_.setWindType((OptionsGame::WindType) (long) SettingsEnv::IDC_COMBO_WINDCHANGES_CTRL->GetClientData( SettingsEnv::IDC_COMBO_WINDCHANGES_CTRL->GetSelection())); - context_.setWallType((OptionsGame::WallType) (int) + context_.setWallType((OptionsGame::WallType) (long) SettingsEnv::IDC_COMBO_WALLTYPE_CTRL->GetClientData( SettingsEnv::IDC_COMBO_WALLTYPE_CTRL->GetSelection())); - context_.setWeapScale((OptionsGame::WeapScale) (int) + context_.setWeapScale((OptionsGame::WeapScale) (long) SettingsEnv::IDC_COMBO_WEAPONSCALE_CTRL->GetClientData( SettingsEnv::IDC_COMBO_WEAPONSCALE_CTRL->GetSelection())); - context_.setStartArmsLevel((int) + context_.setStartArmsLevel((long) SettingsEnv::IDC_COMBO_STARTARMSLEVEL_CTRL->GetClientData( SettingsEnv::IDC_COMBO_STARTARMSLEVEL_CTRL->GetSelection())); - context_.setEndArmsLevel((int) + context_.setEndArmsLevel((long) SettingsEnv::IDC_COMBO_ENDARMSLEVEL_CTRL->GetClientData( SettingsEnv::IDC_COMBO_ENDARMSLEVEL_CTRL->GetSelection())); - context_.setMinFallingDistance((int) + context_.setMinFallingDistance((long) SettingsEnv::IDC_COMBO_FALLINGDISTANCE_CTRL->GetClientData( SettingsEnv::IDC_COMBO_FALLINGDISTANCE_CTRL->GetSelection())); - context_.setMaxClimbingDistance((int) + context_.setMaxClimbingDistance((long) SettingsEnv::IDC_COMBO_CLIMBINGDISTANCE_CTRL->GetClientData( SettingsEnv::IDC_COMBO_CLIMBINGDISTANCE_CTRL->GetSelection())); context_.setGiveAllWeapons( SettingsEnv::IDC_GIVEALLWEAPONS_CTRL->GetValue()); - context_.setResignMode((OptionsGame::ResignType) (int) + context_.setResignMode((OptionsGame::ResignType) (long) SettingsEnv::IDC_RESIGNENDROUND_CTRL->GetClientData( SettingsEnv::IDC_RESIGNENDROUND_CTRL->GetSelection())); - context_.setMovementRestriction((OptionsGame::MovementRestrictionType) (int) + context_.setMovementRestriction((OptionsGame::MovementRestrictionType) (long) SettingsEnv::IDC_MOVEMENTRESTRICTION_CTRL->GetClientData( SettingsEnv::IDC_MOVEMENTRESTRICTION_CTRL->GetSelection())); } @@ -809,10 +809,10 @@ int downloadSpeed = 0; int keepAliveTime = 0; - context_.setTurnType((OptionsGame::TurnType) (int) + context_.setTurnType((OptionsGame::TurnType) (long) SettingsMain::IDC_TYPE_CTRL->GetClientData( SettingsMain::IDC_TYPE_CTRL->GetSelection())); - context_.setTeamBallance((OptionsGame::TeamBallanceType) (int) + context_.setTeamBallance((OptionsGame::TeamBallanceType) (long) SettingsMain::IDC_TEAMBALLANCE_CTRL->GetClientData( SettingsMain::IDC_TEAMBALLANCE_CTRL->GetSelection())); context_.setTeams((int) SettingsMain::IDC_TEAMS_CTRL->GetSelection() + 1); diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/tankgraph/GLWTankTip.cpp ./src/tankgraph/GLWTankTip.cpp --- ../tmp-orig/scorched3d-39.1+cvs20050929/src/tankgraph/GLWTankTip.cpp 2005-06-11 16:53:41.000000000 +0000 +++ ./src/tankgraph/GLWTankTip.cpp 2005-11-01 15:07:15.000000000 +0000 @@ -66,7 +66,7 @@ void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position) { - tank_->getPhysics().revertSettings((unsigned int) entry->getUserData()); + tank_->getPhysics().revertSettings((unsigned long) entry->getUserData()); } TankFuelTip::TankFuelTip(Tank *tank) : @@ -170,7 +170,7 @@ void TankBatteryTip::itemSelected(GLWSelectorEntry *entry, int position) { TankAIHuman *tankAI = (TankAIHuman *) tank_->getTankAI(); - for (int i=1; i<=(int) entry->getUserData(); i++) + for (int i=1; i<=(long) entry->getUserData(); i++) { if (tank_->getState().getLife() < 100.0f) { --- NEW FILE scorched3d-cvs-20050929-bins.tar.gz --- ? ?) ?U?( ????2??????_?=?q??O)?jY????%?24i)??????????=? ???ZZ?????????&?&???666???NNN.?.???^???>?t:}????G????BCC#.DDEE???q??????????O???????TTT???566??y??_Q(?<:?ck???l+g'?c????m?#;?D?S?~?%}?E???o??4%vPiJ???Q%d?$?e$?d%??(j?Tg???v??c!?S??Um????g?{_??f}~????k,?o0L?"?$GU?????R???i???z[9--??????obbna?????3O??????????`v?#8??c??=-??????????7?ii?????V????|?!lh? ???????????.?2?J?4E9%U)V?????4I???#>]??1???????f?)eF?????1??.??!??????????n???????^???>?8LZZ^?*K?J??)???&????o?^??????f???w;???????3?7???^^I1;????????????P??????V?R?7RH?O::G??????z?????????l?}?_????vX?????0???ld?????????r??5Y?{M4??X???????4????8?|?lG??^a7???`??;?D?-X:Hfk ?? f5Tr??Y at SSK???t??U?99?p???????[?n?.t???tN???y???????@??7x??J??;??4_?$?? ?y? ??O???????>??+?)))?O???G?@x??_?&??n?e?$??l6?[?%??????&????I???>??r?!?S?Woo???t6?>????7o?l???3j?l???V????)k??y|k?d???51??????>?]???????????s??Wc??? ?W?????????][?]:?????.p??Ll??????B??????%?0????;?,l???1??n??????\"?R L??%Y/[?[F~J>s???????\?%??/1J?={Nq?????????U?) Y6;?s??????C?[?_?Y?}??k.]??avX???S????;?j???????u?t~AVs??????w??Hc0c???????j????b??Z;?F?)?\s?dl]yRsClI????1:3-v?????n5???_? W0??,l 3??#?g???U?g;???r??????????????????~NbE????F?'O=+t??????e??? ??0? K???L?V6?G?1????: ????_` t??_$?(I????O???4]??bdv0????yj?3?:?\????yyP???????y???W??b??????I???U?H??O*?????lnQWQZEQU?UT???3????!??C?o???z???= ???????K?~??/7?f?)?6spV[?P????RRf?x??G?3??c ?1????if?????K=?X?K???8cV?b??CI??2Z_D0?/U4?s??:lUA???O?TTDy??E????_0??q|0???/<f?????>?)?Q?5???Z??a????~??[????0+??Y???j????????5U'FN0efVY???n??E]c?i??dd?x?z??+u ?????????(??????G?E????g??v????c?L????5?y??UQq?k????}???n??iV?pW at AY??&N?2??.?`Htb&????qI?????c?qi???^"V??H???=?p.?u 8??}????n????U???:???n???F????$7v???????+??&??4?`??7????y?????v?f????>??q?j:?k>p?gy]?h?F?6^???FGs?????????2a? c?<7v???F?N??G?l??gD ?;?O??(??$r?????????????r^???????M?2f?K/??>??m????s?w|?????S5ZqX|??U\???????*V?w-'4i2?G?O??????{???? ?H????3\&M???1???5Q?$'?????????/?B?a??#B;?? Cr?????p?v??.??aW????Y?N?0z?+RM\?!}???????=?@"+???????^?J?^}r??P?J_??????q????'??5f???;?o?.???k?????:v???u?J?O??\??r??_???s?;?????xi??in??N???S.! .#?? ?B???Q??????????C??????|??$?5 /2????GhG?????r=~?s.?M???:u???1??]??F? h????6;Uw?DA}?6+g4_????'??ty ???O9f????>?q?3c?"????S??m?1??o??K?vp?;??f au?T????P?????l? ??n???n? ?Y?\^????'?lm ,?lxU?_B[??^?Z??F?/K???Y???$??'??!??,??? ? _?*2??X:? ?L????t???????????o??E(??[??O?~???^??V`?FE~ ??@?????djT???P`n36?#4?C??c?E???y??? ?[??1??t??&??,q???H>~L!xZ???p2!??`|?'???????>??????Y?X?[l??n??o?????????????v?????fU?V ?pfj????i?q??s88 ??????\b?L?.NA?OQ0?c ~???P??f?X?m;???K????i??u{??6?!_????M??7??[?+??H????p????? ?q s?y?'?b9aQLo O?a??\? O? ???Q?? ??[}??U? `?????w?Av?)??S????M{??&?????&?xs??u?+ M?s?g??z?S???@??f]?Uh???i???5WX?????+??K&? ???????F?v??J?U?????S?????J? ?q??I?v?AM?Y?.Hr$???????% g ?? ??{?5M?????{??{?7????????sl????tc?B[p?9$??????|? ?5??????Ls?';???p??3Z??f?Z(,W(??+???iE5????iv???|t??g??Rt?AK???"c?lE?? ???\y_?.??????????????lN?s?c?DR?V? ????!???h ????? ??C?<??O#????N)b ???????U?t6???L???5??????xe????Y?S?Qs{c@????h?VoT?u?}??5?I4??)?*?{??e???s? ??V?V*???v?8?4?h?AT4??a??at???b?)?g??c ',??@]8???!??????SSk?oy? 7?W?2??k?)??????t(8?o ??"?{?????k??????"???l??LZ;???W+?K*????}L9???yv???(H|???????Q???? JY0?U????;9?B?????????;?Mp}???? .?bXB????+???tsT?1v>????|?z?????J?? U? T?3|?1???P|?? 0????S????3????u?????'8??9D+_A?n8^????????S??a?l ??F???P??R?h/~????)??f??????? mQ? o???8[?l?F_???S~????S???Oq$G?cR?16s/?????@?S?????;i?k?oI??J ?????x????? 6? @{??jg??h?Z?oEY??? ??B?MQ??e?s?????????C?????Y??z???r???y?~??x?s?V???xc???Y?:?/?i?b)?????+?|???Xl???bQs?^???_??????Zd??b;M?~!??6.?r???/?j???w?e??py?????????????1{?5????Z?;x????????y???v?!?}_??K??}/?;#????V???|?(????r??Z3?-Bn???)???????n?y)?x?#?oC???`???]J????p?8???9?V?YJW&???0Z?????=?*??l?~?j1? 16Az1?-? ??b`???\? Xt??"[R?-??f?F?b??z?z?y??zyz{????S??K? qk??pU=:?n???=0??*?t ?|???? ?Ch?v?f??J?????g??U-_?????????P?w??C?????K??????/???w ????d}?C???21??s?s=??{???????????B?I?c|????eD?A??l>??????K??d?*Eb??????i:???? ????????##?cc]???????>U???[?V?@?&n??? ????h???W???R~eQ%??,RaFQ?Ni?a AQ???w??z???\???dp??%-m?{l?????A;?????v?Fh??#?;??9"???'??r?w???g????% qs???"???#? ??$?? ?A????{????v??oD??79A-?K?X??/??bY? ???[_???a9,F??.???MI6?}???&??]!h ?7EW?????????z+-?7;54+%??????=??? ?_?&????H??R?l??o@ij????????QC] ?B; R???r~Ss?P???x< ?C?w>??WS?d?????? PnVRz|t???1?w=??z???lQTmbf5?Pz)r F???????l?????N-E?O?????=v?wnC???-??9:-;?-?kq??A?o??n?????l0??J2x??3??[-?o?????[`?s?z??&??rl?Gb???3?H> Z ???c??u?XT)?%tY [??????z????????jl\39??`z m;??Z??[??m? ?tu????x?A??_lzc???d?g????????Ps?o? ???;IAa?????L ??#?%??L% ????sH?A?&V??????? ?????[GG??'?????y?|???_M????????????~~? CB???=?b?[ ???????????R?7YZ ?3??m????????mi#????XZ?????????{7??=???2?????%???????l??7?| ?? ? (?? ?UVsr0?ZzrJjb^>.;'3+;?A?Y??f??&9N?G[?G??:a(?Y?U??^?h?!????2?'??????X?_J?7??????d?c???nNK???e!+M?^Z??c?H?0??S?5?pj??2"??)9?????%?? ? ???R??yZQMUq???P?n??U 9%??????J?|?e???f?P?rt ??c??????fg?????(?Cr??&|H[W??C??^???L\WXZ?Y\??????3s????\N2? IN?O&?S?X??E??E?bqD?????3?)?????,&2???Q?/]??????FF????????l?So?r??_??-??K|?V?2?????d??w?;?) ?y?T?@%??I?D????qW???#\]n??????????/*?*??}/??mk+??`?z??l??Wai????o????g? ????X??t???v????7W??~??o?????A?6???????6???7H?o?? z>??? o???|?????\:?O???]u9v??%??[?]??;W?9.???0? ??M*,`??2??????iuGg]Oo?#?tP?1??;1=4:???R?? O?????V?????????d????))?? K? ?+????? ???\zf?W?????A??d4????? ?W??"?c?q w?????EH?~??`a?a7X?.p8???M??+|?m???Q? ?????????r??#???O?_????4}?MM +?L?????O?*??Ph??X? 2v,? ??)??&?????;??w=y??'??'????? ?? ???B???X?9?)y?????A??R ?????Q?\???VM B&g?K???????????????Ay?????? ??\?`LT>????6 ??? r^.7?Ge??,^??7a?????D ?CS?*?*(?3???LAi?????m??W?X? X?+?[??a?BS?'-u? ????????=?P???????>?|????W?<K $???? ?4n???#&? ???4?MLK?B?s3???b???RP]?A ????go?l?[???????Z??? *j????s4&?X 6???`??RAAD?I?: ??0 ?*??w?????????lX???W>???????????????????;?8w????m3o???~.@\?#??N???I????T ?+L}^?Z?????VZ@?oh?bkw]??z)?Z?"?m?hj??ggt?^Yg???\??? a??|?C???? f?N????D?#????~????C???c????C?A+w??yn??????v>???gX{?q ?? 4? 10.:?1cH?r?C?L`????S!D|?J????|?F?F?W????_????j??.????3??W????e?F?i???M?????|?g?` (???3?'7?????? ?? D???????????????????)????????u?Uue?????((*v?BPAP?(?T+??FETD?????.b?,t.?????{???????????????F3????w???p??g?k??s??~??:-5I?t???k?????w?C?^???} ??Ay?????o???A??j8T?????????+$tD??5}????J??c????>?G????U at F?d?xe??K??K?, T???6~dq|???+?^W?k?U?W^]????;??|?? ?? ?o?o???#????m???????;,??:dm~h?[$t? 2???????}?>??C\?}??'???;?l????}?4???|?Dj??k???? ?H??G???????>?s???_??*???s?(????C?]??0????[?mv v:8???W?d????OB?y???qs8??*????rr?O?0???fE?D????>}rd?????n??E??y?? ????/????B?p????w?_?~????g/???????E?W?/R??d??L???????,eyA~Y??T)+S?Kdh??5??????WkD?0^??iy???x ??w????niJ?M??o?????_??o+???? ??????jaO???????E?o?h?N???m??n??p3uw!?7?F??a??t[??_y??F????"???X'?|?Jm|??&??ZF?y??0zX??@?>??v?b?m?????(V????? ?? ???t???~r?g??O ??N???=?l?????9QK??@??;???37?1???????_p ?????x?????? ??????}???/.?9s???\q??"? yv???????Q??D??? ?l:.?8vs????/K4?]C???-4?[?N3jZ???????'>.??!?????D??f???O5???F 8j?$|x?q????DF???(???f?^?q??];?B???v???????"Yq??????\????+??]?s??7?}????? ???????????????G??_???oA????&????]?p????e?? ????s ?bYNAV?233??.O???e??r????[?F ?ii4?????N+?2?&??g???8?k?o????@??u ????SG?Z?????[?u?J???))?????4??3h?G?p??Q??"?O ]?0u????+f??????-?L????????? ?e_\??????o}#????????????? ????????g/? ???/~y?? ???O????????????<#????????ee????? b at u? oXF???????*?#??c\?t? [??}g??q?a?\???a ?amA*???A"??@Kwj?????U1??d?c??? `h#%??}????H??h?/?z??;?q%??d?SeU??A?fY??? ?a?x????: ?S???p????????\5?"?0h?u8?>?????a??????, 0? ?`E?dp G#???h???&??c???9??? 0???"?SD4M???????X ?B?F? nY?f???A5 ? A? ;????? ?*n???>??m>H???K??y?h?l?????AZ?????x??(?3~???v???t?s???5??=?)?7?S<????}???t?B?Q? ?9|5?q?????i???}?`C?, ??"ZT=?B_?xP??X???????`@3??1??????p?z!BEh ???????8?????}o?? 6.@??T?+N???8???B ?@???R-?3g??8! ??K?X?AS=_????E?OFDp?G[ ?`^?A?O??????>C?C??? ??x?~????-?N???@???f<$1 ?H??? !???????'Ju??O?R?????????~?~l?I?%n"? ??h ;b{zg{???/???/3??K?-?U@???LV?F?? /;8?ej?'>/???b?9???t?$?QZ???hs{?????`?$ph?@_F?e? >???7? ??b?\&?O?]NJ?E???? ?8????Y?F?PM?X???1?'E????b?H?1 ^???x ,??]??Ao???Q??????-? ?p??????R??Wm???????? ??qea?] ?;4~???????16~fF????aH?,,V>m????oP???1T?????????w?H????????2\?A???h`H???n????? %??????-IL???u:?]???j???67 ?-R?o^?6?????H??????"y\ ?@????M??N(?\qO?^?Lq????he%??e;_?????K???6w??=(1fZ???,A?????????????m???L S? ?T?????M????|S????? ?2$`G????????c???,??,?G????Pm?hnW??E???????????]???>7~????G??? ?}g?~m ?6???????w?Jy???}?????E??6??] ??3???O???????}?)????O??g>?S??c??????O}??v?G_????g???y??????}??????s?y?????%????G?hq??Ow?????????????????{?={????????????[[[????#???>?'?9???#?|??|?????????????O>??S?????G?g_?p???>1???????o??????C??7!?tW? ?J?x???=P??!????I??w????~??O~????C??K??K??}??????_;^?????H? ???e?????????{????????/|?3????>?????\*??????,~?@??'?o???????0???/~??????#????~????????G ?(<=Xx[?4????A??O??O??|??|?;??;7????_8?F[C?????o>??? '??{?>??O0*???}? T??#????_=V??O??????????????????????????or????????q????K???:??ll????|?=??????????=C??????Wx?x??U????}???:????????P?]?????|?r???B??????3???U?]-??????;_??????????~?!~?v????v???s??????q?????????????;???????????2?{=7??(?E,?9?-????]%?< X?2A)}ru?j???B??????u{??j?????|???]???????>????W?!uH?W?\??}J?s??u*?J{z?? ??}??*9S??:[?k??)?aw?Wx??5?P??Q?<#?30??/???4'?_?;??rE_?z???? ??$??X?-?? >?b`????-?$?9'??? ?4W^?5???? LF??}??????F??????v %C|X? ???'?L?CW8wo?]??y2????????\??Ps5?T?{???dv???????Sh?{?%E?O???dO?r??"c?y_1?\L?????/??Tqd?????V?*?'I????l?`??5?]Im??O??Qtm???tg??=?^???|=?s???V????l?!??$?l?Pd??{?2??e??B? ?I?????????? n7? ?M?-??~??d?NvW j?2??J2v_????X???O????|'?????,???B???$? t?A???m?M;?T???m&???yM??}i??????????O??Z???%??k? ?5? M? ?XaI?`V???=???\/T??? 7????e??I??e??w????Q=l?U???15??-,_?8l????3k?S?[@? ?ZNX????0????? &??0??? ? ?I?i?,WX?|)?? /?????7?????iCwfT??d??H?hd? ??O???????N=i?uWh?? e??~?F?GI?!?(2????}5??>N?p?)i?"t?O%? u$???]p????F?{?S_??4?MlLXU???M??uhl f?k>??'?RJ?P1?F?J?4??k? ?3?t?j??5]?B??`F-?+?k;?D?? ~??!????P????:??a????$????|?q3gCLgZE{?U2 F?A?'?? :H?y.^?FHB??#?V?V f?Ud???q????????#P#l?e?????`X?XD????%U} w?e Ym(??r??:}w???n ?])?.?N??c ???? ?????[????6??????f???jfw??|?j?S????$)?!A?A???kKU????ayk????]fK?va?????2m??k?w???v,??*??Q1E?z??8??wo7cC?q?????d????EC??Z?|?&6??7xo?$/Z)4?\3???=??`Hm1 '???B?Ux?'S?[ ?a???`??o*?????xm?f??x:???v??0G??q??? ?O???6A??(V??'??A?????4e%h??'??+???-??R`?u?K~8 ???p7????5a??Ks??Jfk??9:8??T??-V?XdU,?[?p?HE?&???Z?H?{{? q??\??e1?6X?b?w??_?????8k\Q?t]? Z????????1?":???"??;?-EX?8?(N??7 ??(?n?j)NvG???Q?Of?<37?v? ?G $=?k/-?Y?????? b?Xx?b?_?/ N?WUTb? ?????&qe??k|\??)SpV?iu????rU!P?e7mf9;??Q??,???K??????|V1???/?x??U?6?22l?*p.??k?+???V????U???|U1p????W?1"=q? WQ~??G?????e??e:??v???AS?;h1????-7???????Z??????=?j????v?????W?Q t1?o??~? x????????C? ??k?;};w???*??W??w? X??&F)~??????Wcq?^?????????U#?G????ex????\d?$[c????j???f??????!V?q?/?????? ??U8??2~????\?r]???`?U? N???.b~8?V??6?eqx?2?n?&?? ??XE??? =?F ??5?>?z?x??H??V?66?X?MG,Z}h;??9?????*?????????du?VP^???X?Lr????1??@.??D&??zY??>T?S?XdF????J'??E?q9?Y.??????Y???,8??L0?(??6-c???9??? &Q??w7?@nZ????]&C?"\??0j=m);d???ez?????T??|??V?M 1C??????y?? @?;?,U? x?????*?B?]??ZR)?\?P? 6??v?"W????M??&????n#?j?U0?????f][? ?Z??M^A?a?j? ?l ?? ?nK?????t?q?\LV=&b?c[??y????Np ??>???0??4??`?? ???jB???U1 ?v??%??ZaY????G???[i>,a???v?UK?????M?r??$??s ?!tX?? _0???????4??,lMR???uh??????/?o?6Tc1\?vc?;?????W?????m??bjM?w??E??{????Qw?s??mw??7 d6? rX?UO??MF????X?????{?]???n?0??w????A???????91????,a???U?"?jX???????h_?W?m;?XW??Z?5bF?]???R?U??T-?[s???=bV?H??}t??@B#Q\?cZMY?;@T?????.?+??j? ?(6#_?????_N_?_O?:????J?}??F?????_N?`?,^-/?t}q ???=??,??f?8????whr????+?"???L????d?? ??b?U???[ )W???z\??-??i? {wdh?a>?bPU?,?????v?T1vr,???&?sA?r;|x?fY\C3E??VW??sgj????????? ?ai??(???2??Gs??h??J?A?a???i? v$?????uU@?=?|??cn??^u? ?n??[V?ks?o?R?u?t-?5?? ??N)J?1?[?B?????^u0?Y?:8?k????3?\???e3?q??????????+?F????::|z?wb????(?`??3C???^ -q???w?)??????Z???_??? vj?t?? ????e?H5P?+???`:????3??ZIUet=C??a?????#n?? l?9k/???????M!?SkNz?#~_?Ye?q?;?????w?;G@?iJU7EI????2???7?M??????w?p? f.??"????j????????????(???????+?N??a?rr???*?????9???@ ?????D?!,???z?u?(\?R?@???+p???%X?NwovO?'?aU?? 7??u0?nY?H:??v;???? ?P ???Xm"?E???3$;Zg?'][??:???l??t?a#]o?1??N???q?? 2-??pK??L ???5??{?????G???? ;? ??\??c??@?4???SHn0v?????{???L??)??F???c0?S??Y?)?????w????%?????{\????'?!P????T{?E?????????>8wL??ip?fN`)`,5???2U6????'???hu?/:??o[?'???Rn?g??7??Y???)??W????c}??yfs ??? ??%bT=M?????p?Y"??5?)??"?c`???????p`":3?vc????????Y??Y8???"???w` ?x.?Ad???8?Y?d ?|???"??P ?\ /?y???a??????TDw???????)??F?????,???????)??x??_Bu??(>}????3???`?s?H???@??!????i?s??`??^????t ? ?q?????Kn;????%???k?25?7?s?Wm?x(???S?y??2?2?????&?d8? 2????8???xv??1?????X?A?t_??&wM??S? y/????(??N??]???&??L?n ?.?>??J^QMZw??~.? ?c????^?Q??:kR}L?a???a[??]????-???Z???/SArF>??VSw?`?K?????6h?&@?[??????h`??? ??K k;?f[??6?`& ?Fk??Z6?n`??b2??*???D??x?9b?)????_F%?t ?7??"?X???:?`+???*?X`?C`?1????????n?*?N???t?=L?n??_??.~?????=u%??4x????????? X{?,????????Aw???u????.F?C?c?M???A?zM"+?f??q ???[i????e?????(?F^? .J?0????%??]?+n*?!???N>? On ??w??S????n?&aD??i????D? 7g?%????L/?&??2#-?`?v_ ?l???"?????t??P?0??t?r? ;v)?????sXu?=?< Wu}?;8_%g??H????'????I?_!Fn???v?'?Hed?OuA???l+?+???????KD?M??`R?T ???p]???F??v??;?t?i_??? ??w?v?????????Y?3???H???D2W?(Wg????CAk{?~_?????M??\??7??????Epd??H5?;6b??h9^?????????????????h???~F0??? ????????b?y?R????M#_?Gl'?>{?|Xg??U????o?U?M??T?sx??4:??????E1?+?C????R??O??1M?\ ?H?)?]?'?Id??????V??x [??s$????TQ E?????x? 2?-<??dv???(?w???vbv???????1?5??%????]?a?W???,,? ??N ??????Ed??V?????J6?N&? G???i?????FS??yw?LfN?'???`??%????G??\???t?+???*C??^3? ?c??t?b?????Ev????*"?a????h?O^ q+???????U????rE?^p?? >??]??uOXm{ ??~@3?e?A????? ?;??}? v?y?xe????[??c? 9?'??O??6?????b?eyW8 K????o?(f????91?>?iH?P|?1?e2????yb??? ??J?!w??j??J??~?|?????YU???\z??A???=:_U$?=?????n$*????`g????+D??4?@?????-^?????n?????'?tw =R???0???4??Bz?p?q??K?~??????H??sz,s??u??P"k?I?%???q??m??@?~F?h??a7?I?1u?g=???#?>c??(???J?C?lxA?5? s`_??hO??;?8E^~?(9?Gc/??7?&^???/??iaK??k(??????:?^???(?????:?\????????%\?w??|[ ?jg6?L/???f6?^:??J?s:???o??????'l?D 4?????????z?`?| T????3?? ????? #?? ??e??????Wmw??Nq?o???z?OSd?????(r???Hj ?D?Y?( ???7?.?0:q??h?'f?[X?N??~? r?Q???F/?? *_??w? "?-[?????5??X??S???!{?V? l?????a???^;???e??????V?? ?u{?h ??????,y,W?c?@???I??\?~E{??L??B? ??u">?'x 9?~;???? ;?`?E??X???3l#??t?:C)?V?[hu??,????Nj???????'?~u???=F`?????O3??????f?uZ ?X??4???K???L~??m?W?G??M?+??? 8q?.?0?_;???~'F\????? ?????l=k???????x#?????? S????i???v????0?o?ug?1???6BV??C'?????{?(??>d??=[w??_?????b?Y????NA?"??.[ q??????Z>>????????z???V?????/??4?85?-?Y??N?K?l?:?E??AU??V!?)?6?~*-???LsH???W?l_?Fm'?$?3?;??q?u??,O???????W?YM???Y/?F*???n??d[??*O ?M*QvM?B?????? m?}??j?zC9?g??G?Hz???4g??F???c??? ??.x????asou9)???@???t,??x????!9LX????wD?3?????bh???m$?Q3?m>?Z?*S??A-??O?9([??"?:?Y7-q?=?}?u??$??2??i?a/?I?\????????u??>E????P?9?~{?R?:?]o??j^??d????`?:?K|?? Pg?w?:(? '?_????E?hAN?i?????|C?? ?B??ca?LW?0b?z???p???h?=??}X?c??e?^?????F@I???O`???>???? ??=? Iva?U????v2U]Gte?o??? ?????3??y!??????7?t?)????.?pdV????r????6-^? ?R? C?2????????~g??=;{?k?{?[U????1k?????g?E??0??Smi;??????E????_??SQ???hk??????X?_?F? V????UU?.a??{?h=]??HY???7??ukU.???J????h[A??A?z|1???!u???_}^?E;?N???#????5?K??N??a????,l??j]?R'?U?K}??Y?">??c|?f?a??[?????FW??N??*?Q??????fYWr???t????????3?[?????? E?Gf???*<:??G"A$?f=???!'??'??n?5??nM??i?????9??u??N??Og???%?? [*?f}??f??i??z8-Y^???\o?????A]?????4?=MB?'?'[?>t%k??g??t??^??Q?H?S?!???%??Oj=??33?|??s"*>?????3???TU?.(.???????zR~?F~?F???|&?Y 2V????S ??f?:X?Q{:A?????Y6??????Z??????{f?.?:?vm?\?????6q/?????'?,A=?r?&l>h??tR??k?n??y?bUu??6.??v???B(?f+??? x?/?????l?\i?W?B????eY????"kA???O? r.??? ?_???j????s???u^?O+i?g|????%[w?N?$!???U(?n?]?r????.t?dO?PPe??3?????^?3?????I??6?? e6?fP%???_?NP????h=?J?r???v? .o?n?????????OS5?;bGP??5? ??{???W?gv???????=?C?L^*?u?X?????g9??????????9A ??1[Odg?a????l1?????]?u?R??:?????&7$kr??!?9????;Z ?????? ????p?pX?i?{???u??wX?????_???&[?????'?wY?*f]ki?????h|7f^????\?c}}%???h???sov{T@??u??F???QI?? }??"???W?y?XQ??V???i????+???k?,??????'????L?;?5?D#?????-?c98???v{R?2{V?>a?0???]???5??i_????=eGl^#?9R?fU???]FW???b?k>??5??)6?.t?qu??\MMO????34??&G????s?z?ZU????7??????vb??2?V?]??lE???]??'?Mxwf>m?r?J?3a??????Y???i???Po?)???M1B1?-*W??????MF?k??MM?3???l7????qZ?M?'?Tk?7 ?????lq?^?v????????=???,?Y?j?2??\?"??r>?R3??s|?w????????? c????Ga??o?3????JL????c????2?Xw\?{V?NHTl^??d?c?s ? )?8?t??s?GHa???????9??>\^??w0?&{t???f??tk?e??D)r/?4?r'~?nk???9?k?.??Y??V???V?????@{???^]?HB??Yt???????{l?`c??+7????h??V;???k?=?)ry?x-lX? [???'? e^?7?8?i?0?|?Z???'=X?+XbL?L??q?^???????^1O????W5+?????|4k?????\~^Y? ?'?Y."??e???z??q??4Zo)Do?{?????E?5%v"[?????8V?'7s!???????Hr????? ?bl>????X ???E?\]_?y??Bn????(???V????&???? ???d;C,??f]?KMIg??ymF???vM-?^7??U?gZ???=?Y^?*?q"?M?L??U?2-??r??x?1?g??[?a?k???V?UK??????????_J:?a?,n?g?9{D??d??A?5!??;?#?????????V????0???-hQ???7???z????7???z????7?????? ? scorched3d-cvs-20050929.patch: --- NEW FILE scorched3d-cvs-20050929.patch --- diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/Makefile.am scorched-cvs/Makefile.am --- scorched/Makefile.am 2005-08-30 20:04:22.000000000 +0200 +++ scorched-cvs/Makefile.am 2005-09-22 17:14:27.000000000 +0200 @@ -71,13 +71,8 @@ data/keys.xml \ data/landscapes.xml \ data/landscapesdefn.xml \ - data/landscapesplace.xml \ - data/landscapessound.xml \ data/landscapestex.xml \ data/mysql.xml \ - data/pgprunetables.sql \ - data/pgsql.xml \ - data/pgstatstables.sql \ data/playernames.txt \ data/prunetables.sql \ data/random.no \ @@ -96,7 +91,12 @@ data/tanks.xml \ data/textureset.xml \ data/tips.txt \ - data/windows.xml + data/windows.xml \ + data/pgprunetables.sql \ + data/pgsql.xml \ + data/pgstatstables.sql \ + data/landscapesplace.xml \ + data/landscapessound.xml scorcheddataaccessoriesdir = ${datadir}/data/accessories scorcheddataaccessories_DATA = data/accessories/clusterbomb.ase \ data/accessories/clusterbomb2.ase \ @@ -114,9 +114,6 @@ data/accessories/barrage/gradient.bmp \ data/accessories/barrage/white.bmp \ data/accessories/barrage/yellow.bmp -scorcheddataaccessoriesbeer_bottledir = ${datadir}/data/accessories/beer_bottle -scorcheddataaccessoriesbeer_bottle_DATA = data/accessories/beer_bottle/bottle.bmp \ - data/accessories/beer_bottle/bottle.txt scorcheddataaccessoriesbombdir = ${datadir}/data/accessories/bomb scorcheddataaccessoriesbomb_DATA = data/accessories/bomb/black.bmp \ data/accessories/bomb/bomb.txt \ @@ -142,23 +139,12 @@ data/accessories/hawkmissile/hawk.txt \ data/accessories/hawkmissile/white.bmp \ data/accessories/hawkmissile/yellow.bmp -scorcheddataaccessoriesherringdir = ${datadir}/data/accessories/herring -scorcheddataaccessoriesherring_DATA = data/accessories/herring/body.bmp \ - data/accessories/herring/eyes.bmp \ - data/accessories/herring/herring.txt scorcheddataaccessoriesicbmdir = ${datadir}/data/accessories/icbm scorcheddataaccessoriesicbm_DATA = data/accessories/icbm/black.bmp \ data/accessories/icbm/gradient.bmp \ data/accessories/icbm/icbm.txt \ data/accessories/icbm/white.bmp \ data/accessories/icbm/yellow.bmp -scorcheddataaccessorieslaserdir = ${datadir}/data/accessories/laser -scorcheddataaccessorieslaser_DATA = data/accessories/laser/about.txt \ - data/accessories/laser/alpha2.bmp \ - data/accessories/laser/blue128.bmp \ - data/accessories/laser/hlaser.txt \ - data/accessories/laser/laser.txt \ - data/accessories/laser/red128.bmp scorcheddataaccessorieslittleboydir = ${datadir}/data/accessories/littleboy scorcheddataaccessorieslittleboy_DATA = data/accessories/littleboy/black.bmp \ data/accessories/littleboy/littleboy.txt @@ -215,6 +201,26 @@ data/accessories/smallpine/wintersmallpine.txt \ data/accessories/smallpine/wintersmallpine2.txt \ data/accessories/smallpine/wintersmallpine3.txt +scorcheddataaccessoriesv2missiledir = ${datadir}/data/accessories/v2missile +scorcheddataaccessoriesv2missile_DATA = data/accessories/v2missile/black.bmp \ + data/accessories/v2missile/checker.bmp \ + data/accessories/v2missile/gradient.bmp \ + data/accessories/v2missile/v2missile.txt \ + data/accessories/v2missile/yellow.bmp +scorcheddataaccessoriesherringdir = ${datadir}/data/accessories/herring +scorcheddataaccessoriesherring_DATA = data/accessories/herring/body.bmp \ + data/accessories/herring/eyes.bmp \ + data/accessories/herring/herring.txt +scorcheddataaccessoriesbeer_bottledir = ${datadir}/data/accessories/beer_bottle +scorcheddataaccessoriesbeer_bottle_DATA = data/accessories/beer_bottle/bottle.bmp \ + data/accessories/beer_bottle/bottle.txt +scorcheddataaccessorieslaserdir = ${datadir}/data/accessories/laser +scorcheddataaccessorieslaser_DATA = data/accessories/laser/about.txt \ + data/accessories/laser/alpha2.bmp \ + data/accessories/laser/blue128.bmp \ + data/accessories/laser/hlaser.txt \ + data/accessories/laser/laser.txt \ + data/accessories/laser/red128.bmp scorcheddataaccessoriessonicringdir = ${datadir}/data/accessories/sonicring scorcheddataaccessoriessonicring_DATA = data/accessories/sonicring/sonicring.bmp \ data/accessories/sonicring/sonicring.txt @@ -222,38 +228,12 @@ scorcheddataaccessoriesteleport_DATA = data/accessories/teleport/base.bmp \ data/accessories/teleport/detail.bmp \ data/accessories/teleport/teleport.txt -scorcheddataaccessoriesv2missiledir = ${datadir}/data/accessories/v2missile -scorcheddataaccessoriesv2missile_DATA = data/accessories/v2missile/black.bmp \ - data/accessories/v2missile/checker.bmp \ - data/accessories/v2missile/gradient.bmp \ - data/accessories/v2missile/v2missile.txt \ - data/accessories/v2missile/yellow.bmp scorcheddataacessoriesdir = ${datadir}/data/acessories scorcheddataacessories_DATA = -scorcheddataavatarsdir = ${datadir}/data/avatars -scorcheddataavatars_DATA = data/avatars/agreement.txt \ - data/avatars/animal.gif \ - data/avatars/baby.gif \ - data/avatars/bavia.gif \ - data/avatars/computer.gif \ - data/avatars/daisy.gif \ - data/avatars/fish.gif \ - data/avatars/flower.gif \ - data/avatars/floyd.gif \ - data/avatars/heart.gif \ - data/avatars/lips.gif \ - data/avatars/mxpx.gif \ - data/avatars/pint.gif \ - data/avatars/player.gif \ - data/avatars/prot.gif \ - data/avatars/termin.gif \ - data/avatars/vader.gif \ - data/avatars/web.gif \ - data/avatars/yoda.gif scorcheddatafontsdir = ${datadir}/data/fonts -scorcheddatafonts_DATA = data/fonts/test.ttf \ - data/fonts/testout.ttf \ - data/fonts/veramobd.ttf +scorcheddatafonts_DATA = data/fonts/veramobd.ttf \ + data/fonts/test.ttf \ + data/fonts/testout.ttf scorcheddataglobalmodsdir = ${datadir}/data/globalmods scorcheddataglobalmods_DATA = data/globalmods/globalmods.txt scorcheddataglobalmodsapocdir = ${datadir}/data/globalmods/apoc @@ -266,8 +246,6 @@ data/globalmods/apoc/data/ainames.txt \ data/globalmods/apoc/data/landscapes.xml \ data/globalmods/apoc/data/landscapesdefn.xml \ - data/globalmods/apoc/data/landscapesplace.xml \ - data/globalmods/apoc/data/landscapessound.xml \ data/globalmods/apoc/data/landscapestex.xml \ data/globalmods/apoc/data/server.xml \ data/globalmods/apoc/data/singleeasy.xml \ @@ -276,17 +254,71 @@ data/globalmods/apoc/data/singlenormal.xml \ data/globalmods/apoc/data/singletarget.xml \ data/globalmods/apoc/data/tankais.xml \ - data/globalmods/apoc/data/textureset.xml + data/globalmods/apoc/data/textureset.xml \ + data/globalmods/apoc/data/landscapesplace.xml \ + data/globalmods/apoc/data/landscapessound.xml scorcheddataglobalmodsapocdataaccessoriesdir = ${datadir}/data/globalmods/apoc/data/accessories scorcheddataglobalmodsapocdataaccessories_DATA = data/globalmods/apoc/data/accessories/black.bmp \ data/globalmods/apoc/data/accessories/green.bmp \ data/globalmods/apoc/data/accessories/molten.bmp -scorcheddataglobalmodsapocdataaccessories50caldir = ${datadir}/data/globalmods/apoc/data/accessories/50cal -scorcheddataglobalmodsapocdataaccessories50cal_DATA = scorcheddataglobalmodsapocdataaccessoriesbouldersdir = ${datadir}/data/globalmods/apoc/data/accessories/boulders scorcheddataglobalmodsapocdataaccessoriesboulders_DATA = scorcheddataglobalmodsapocdataaccessoriesbrownbouldersdir = ${datadir}/data/globalmods/apoc/data/accessories/brownboulders scorcheddataglobalmodsapocdataaccessoriesbrownboulders_DATA = +scorcheddataglobalmodsapocdataaccessoriescactusdir = ${datadir}/data/globalmods/apoc/data/accessories/cactus +scorcheddataglobalmodsapocdataaccessoriescactus_DATA = +scorcheddataglobalmodsapocdataaccessorieschurch1dir = ${datadir}/data/globalmods/apoc/data/accessories/church1 +scorcheddataglobalmodsapocdataaccessorieschurch1_DATA = +scorcheddataglobalmodsapocdataaccessoriescityofficedir = ${datadir}/data/globalmods/apoc/data/accessories/cityoffice +scorcheddataglobalmodsapocdataaccessoriescityoffice_DATA = +scorcheddataglobalmodsapocdataaccessoriesdeerdir = ${datadir}/data/globalmods/apoc/data/accessories/deer +scorcheddataglobalmodsapocdataaccessoriesdeer_DATA = +scorcheddataglobalmodsapocdataaccessoriesfactory1dir = ${datadir}/data/globalmods/apoc/data/accessories/factory1 +scorcheddataglobalmodsapocdataaccessoriesfactory1_DATA = +scorcheddataglobalmodsapocdataaccessoriesfarm1dir = ${datadir}/data/globalmods/apoc/data/accessories/farm1 +scorcheddataglobalmodsapocdataaccessoriesfarm1_DATA = +scorcheddataglobalmodsapocdataaccessoriesfusionbarreldir = ${datadir}/data/globalmods/apoc/data/accessories/fusionbarrel +scorcheddataglobalmodsapocdataaccessoriesfusionbarrel_DATA = +scorcheddataglobalmodsapocdataaccessoriesgrenadedir = ${datadir}/data/globalmods/apoc/data/accessories/grenade +scorcheddataglobalmodsapocdataaccessoriesgrenade_DATA = +scorcheddataglobalmodsapocdataaccessorieshouse1dir = ${datadir}/data/globalmods/apoc/data/accessories/house1 +scorcheddataglobalmodsapocdataaccessorieshouse1_DATA = +scorcheddataglobalmodsapocdataaccessorieslogcabin1dir = ${datadir}/data/globalmods/apoc/data/accessories/logcabin1 +scorcheddataglobalmodsapocdataaccessorieslogcabin1_DATA = +scorcheddataglobalmodsapocdataaccessoriesm7a3grenadedir = ${datadir}/data/globalmods/apoc/data/accessories/m7a3grenade +scorcheddataglobalmodsapocdataaccessoriesm7a3grenade_DATA = +scorcheddataglobalmodsapocdataaccessoriesnapalmdir = ${datadir}/data/globalmods/apoc/data/accessories/napalm +scorcheddataglobalmodsapocdataaccessoriesnapalm_DATA = +scorcheddataglobalmodsapocdataaccessoriesofficeplaza1dir = ${datadir}/data/globalmods/apoc/data/accessories/officeplaza1 +scorcheddataglobalmodsapocdataaccessoriesofficeplaza1_DATA = +scorcheddataglobalmodsapocdataaccessoriesredhornetdir = ${datadir}/data/globalmods/apoc/data/accessories/redhornet +scorcheddataglobalmodsapocdataaccessoriesredhornet_DATA = +scorcheddataglobalmodsapocdataaccessoriesremorcebombletdir = ${datadir}/data/globalmods/apoc/data/accessories/remorcebomblet +scorcheddataglobalmodsapocdataaccessoriesremorcebomblet_DATA = +scorcheddataglobalmodsapocdataaccessoriesshockbombletdir = ${datadir}/data/globalmods/apoc/data/accessories/shockbomblet +scorcheddataglobalmodsapocdataaccessoriesshockbomblet_DATA = +scorcheddataglobalmodsapocdataaccessoriesshockrocketdir = ${datadir}/data/globalmods/apoc/data/accessories/shockrocket +scorcheddataglobalmodsapocdataaccessoriesshockrocket_DATA = +scorcheddataglobalmodsapocdataaccessoriesskyscraper1dir = ${datadir}/data/globalmods/apoc/data/accessories/skyscraper1 +scorcheddataglobalmodsapocdataaccessoriesskyscraper1_DATA = +scorcheddataglobalmodsapocdataaccessoriessmalloakdir = ${datadir}/data/globalmods/apoc/data/accessories/smalloak +scorcheddataglobalmodsapocdataaccessoriessmalloak_DATA = [...6891 lines suppressed...] --- scorched/src/server/ServerBrowserInfo.cpp 2005-08-08 11:37:24.000000000 +0200 +++ scorched-cvs/src/server/ServerBrowserInfo.cpp 2005-09-22 17:14:28.000000000 +0200 @@ -166,7 +166,7 @@ reply.push_back(addTag("round", formatString("%i/%i", ScorchedServer::instance()->getOptionsTransient().getCurrentRoundNo(), ScorchedServer::instance()->getOptionsGame().getNoRounds()))); - reply.push_back(addTag("os", osDesc.c_str())); + reply.push_back(addTag("os", osDesc.mb_str(wxConvUTF8))); } void ServerBrowserInfo::processInfoMessage(std::list &reply) diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/server/ServerMain.cpp scorched-cvs/src/server/ServerMain.cpp --- scorched/src/server/ServerMain.cpp 2005-06-20 02:35:08.000000000 +0200 +++ scorched-cvs/src/server/ServerMain.cpp 2005-09-22 17:14:28.000000000 +0200 @@ -121,7 +121,7 @@ ServerDefenseHandler::instance(); // Set the mod - setDataFileMod( + DefinesUtil::setDataFileMod( ScorchedServer::instance()->getOptionsGame().getMod()); // Load mod diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/server/ServerMessageHandler.cpp scorched-cvs/src/server/ServerMessageHandler.cpp --- scorched/src/server/ServerMessageHandler.cpp 2005-06-20 02:35:08.000000000 +0200 +++ scorched-cvs/src/server/ServerMessageHandler.cpp 2005-09-18 12:39:34.000000000 +0200 @@ -115,6 +115,8 @@ "Player disconnected dest=\"%i\" id=\"%i\" name=\"%s\"", tank->getDestinationId(), tankId, tank->getName()); + ServerCommon::sendString(0, "Player disconnected \"%s\"", + tank->getName()); StatsLogger::instance()->tankDisconnected(tank); diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/server/ServerTextFilter.cpp scorched-cvs/src/server/ServerTextFilter.cpp --- scorched/src/server/ServerTextFilter.cpp 2005-08-14 21:11:42.000000000 +0200 +++ scorched-cvs/src/server/ServerTextFilter.cpp 2005-09-22 17:14:28.000000000 +0200 @@ -86,7 +86,7 @@ for (witor = words_.begin(); witor != words_.end(); witor++) { const char *word = (*witor).c_str(); - char *pos = my_stristr(text, word); + char *pos = DefinesUtil::my_stristr(text, word); if (pos) { // If they do then * out the word @@ -149,9 +149,9 @@ const char *filename = getSettingsFile("filter-%i.txt", ScorchedServer::instance()->getOptionsGame().getPortNo()); - if (!::wxFileExists(filename)) return; + if (!::DefinesUtil::fileExists(filename)) return; - time_t fileTime = ::wxFileModificationTime(filename); + time_t fileTime = ::wxFileModificationTime(wxString(filename, wxConvUTF8)); if (fileTime == lastReadTime_) return; FileLines lines; diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/server/ServerTimedMessage.cpp scorched-cvs/src/server/ServerTimedMessage.cpp --- scorched/src/server/ServerTimedMessage.cpp 2005-06-20 02:35:08.000000000 +0200 +++ scorched-cvs/src/server/ServerTimedMessage.cpp 2005-09-22 17:14:28.000000000 +0200 @@ -76,9 +76,9 @@ const char *filename = getSettingsFile("messages-%i.xml", ScorchedServer::instance()->getOptionsGame().getPortNo()); - if (!::wxFileExists(filename)) return true; + if (!DefinesUtil::fileExists(filename)) return true; - time_t fileTime = ::wxFileModificationTime(filename); + time_t fileTime = ::wxFileModificationTime(wxString(filename, wxConvUTF8)); if (fileTime == lastReadTime_) return true; XMLFile file; diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/sound/Sound.cpp scorched-cvs/src/sound/Sound.cpp --- scorched/src/sound/Sound.cpp 2005-08-10 14:39:31.000000000 +0200 +++ scorched-cvs/src/sound/Sound.cpp 2005-09-18 11:59:33.000000000 +0200 @@ -86,6 +86,11 @@ instance_ = 0; } +static char *checkString(char *x) +{ + return (char *)(x?x:"null"); +} + bool Sound::init(int channels) { ALCdevice *soundDevice = alcOpenDevice(0); @@ -113,16 +118,20 @@ alDistanceModel(AL_INVERSE_DISTANCE); GLConsole::instance()->addLine(false, "AL_VENDOR:"); - GLConsole::instance()->addLine(false, (char *) alGetString(AL_VENDOR)); + GLConsole::instance()->addLine(false, + checkString((char *) alGetString(AL_VENDOR))); GLConsole::instance()->addLine(false, "AL_VERSION:"); - GLConsole::instance()->addLine(false, (char *) alGetString(AL_VERSION)); + GLConsole::instance()->addLine(false, + checkString((char *) alGetString(AL_VERSION))); GLConsole::instance()->addLine(false, "AL_RENDERER:"); - GLConsole::instance()->addLine(false, (char *) alGetString(AL_RENDERER)); + GLConsole::instance()->addLine(false, + checkString((char *) alGetString(AL_RENDERER))); GLConsole::instance()->addLine(false, "AL_EXTENSIONS:"); - GLConsole::instance()->addLine(false, (char *) alGetString(AL_EXTENSIONS)); + GLConsole::instance()->addLine(false, + checkString((char *) alGetString(AL_EXTENSIONS))); GLConsole::instance()->addLine(false, "ALC_DEVICE_SPECIFIER:"); - GLConsole::instance()->addLine(false, (char *) - alcGetString(soundDevice, ALC_DEVICE_SPECIFIER)); + GLConsole::instance()->addLine(false, + checkString((char *) alcGetString(soundDevice, ALC_DEVICE_SPECIFIER))); // Create all sound channels for (int i=1; i<=OptionsDisplay::instance()->getSoundChannels(); i++) diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/sound/SoundBuffer.cpp scorched-cvs/src/sound/SoundBuffer.cpp --- scorched/src/sound/SoundBuffer.cpp 2005-07-18 00:27:13.000000000 +0200 +++ scorched-cvs/src/sound/SoundBuffer.cpp 2005-09-18 11:59:33.000000000 +0200 @@ -55,7 +55,13 @@ ALsizei size; ALsizei freq; ALboolean loop; + +#ifdef __DARWIN__ + alutLoadWAVFile((ALbyte*) wavFileName,&format,&data,&size,&freq); +#else alutLoadWAVFile((ALbyte*) wavFileName,&format,&data,&size,&freq,&loop); +#endif + if ((error_ = alGetError()) != AL_NO_ERROR) { return false; diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/sprites/ExplosionNukeRenderer.cpp scorched-cvs/src/sprites/ExplosionNukeRenderer.cpp --- scorched/src/sprites/ExplosionNukeRenderer.cpp 2005-07-11 01:41:56.000000000 +0200 +++ scorched-cvs/src/sprites/ExplosionNukeRenderer.cpp 2005-09-22 17:14:28.000000000 +0200 @@ -38,8 +38,8 @@ float width = RAND * 0.5f + 1.0f; cloudRotation_ = RAND * 360.0f; - rotation_[0] = getFastSin(rot) * width; - rotation_[1] = getFastCos(rot) * width; + rotation_[0] = DefinesUtil::getFastSin(rot) * width; + rotation_[1] = DefinesUtil::getFastCos(rot) * width; } ExplosionNukeRendererEntry::~ExplosionNukeRendererEntry() diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/sprites/ExplosionTextures.cpp scorched-cvs/src/sprites/ExplosionTextures.cpp --- scorched/src/sprites/ExplosionTextures.cpp 2004-11-22 22:30:40.000000000 +0100 +++ scorched-cvs/src/sprites/ExplosionTextures.cpp 2005-09-22 17:14:28.000000000 +0200 @@ -194,7 +194,7 @@ } const char *fileName = getDataFile(name); - if (fileExists(fileName)) + if (DefinesUtil::fileExists(fileName)) { GLBitmap *map = new GLBitmap; if (map->loadFromFile(fileName, false)) diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/tankgraph/MissileMesh.cpp scorched-cvs/src/tankgraph/MissileMesh.cpp --- scorched/src/tankgraph/MissileMesh.cpp 2005-07-11 01:41:56.000000000 +0200 +++ scorched-cvs/src/tankgraph/MissileMesh.cpp 2005-09-22 17:14:28.000000000 +0200 @@ -103,11 +103,19 @@ Vector &fpos = (*flareItor); float newX = fpos[0]; - float newY = (fpos[1] * getFastCos(angYZRad)) - (fpos[2] * getFastSin(angYZRad)); - float newZ = (fpos[1] * getFastSin(angYZRad)) + (fpos[2] * getFastCos(angYZRad)); + float newY = + (fpos[1] * DefinesUtil::getFastCos(angYZRad)) - + (fpos[2] * DefinesUtil::getFastSin(angYZRad)); + float newZ = + (fpos[1] * DefinesUtil::getFastSin(angYZRad)) + + (fpos[2] * DefinesUtil::getFastCos(angYZRad)); - float newX2 = (newX * getFastCos(angXYRad)) - (newY * getFastSin(angXYRad)); - float newY2 = (newX * getFastSin(angXYRad)) + (newY * getFastCos(angXYRad)); + float newX2 = + (newX * DefinesUtil::getFastCos(angXYRad)) - + (newY * DefinesUtil::getFastSin(angXYRad)); + float newY2 = + (newX * DefinesUtil::getFastSin(angXYRad)) + + (newY * DefinesUtil::getFastCos(angXYRad)); float newZ2 = newZ; Vector newPos; diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/weapons/WeaponTeleport.cpp scorched-cvs/src/weapons/WeaponTeleport.cpp --- scorched/src/weapons/WeaponTeleport.cpp 2005-06-11 18:53:41.000000000 +0200 +++ scorched-cvs/src/weapons/WeaponTeleport.cpp 2005-09-22 17:14:28.000000000 +0200 @@ -65,8 +65,8 @@ bool found = false; while (!found) { - position[0] = RAND * 255.0f; - position[1] = RAND * 255.0f; + position[0] = RAND * 235.0f + 10.0f; + position[1] = RAND * 235.0f + 10.0f; float height = context.landscapeMaps->getHMap().getInterpHeight( position[0], position[1]); if (height > allowedHeight) break; scorched3d-gcc41.patch: --- NEW FILE scorched3d-gcc41.patch --- --- scorched/src/landscape/LandscapePoints.h.gcc41 2006-02-05 20:16:45.000000000 +0100 +++ scorched/src/landscape/LandscapePoints.h 2006-02-05 20:16:58.000000000 +0100 @@ -41,7 +41,7 @@ int noPts_; void createPoints(HeightMap &map, int width, int points); - void LandscapePoints::findPoint(HeightMap &map, Position *pos, float x, float y); + void findPoint(HeightMap &map, Position *pos, float x, float y); }; #endif --- scorched/src/landscape/MovementMap.h.gcc41 2005-08-10 14:39:31.000000000 +0200 +++ scorched/src/landscape/MovementMap.h 2006-02-05 20:15:27.000000000 +0100 @@ -65,7 +65,7 @@ MovementMapEntry *entries_; HeightMap &hMap_; - unsigned int MovementMap::POINT_TO_UINT(unsigned int x, unsigned int y); + unsigned int POINT_TO_UINT(unsigned int x, unsigned int y); void addPoint(unsigned int x, unsigned int y, float height, float dist, std::map &edgeMap, Index: scorched3d.spec =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scorched3d.spec 11 Oct 2005 19:19:39 -0000 1.6 +++ scorched3d.spec 5 Feb 2006 21:58:44 -0000 1.7 @@ -8,18 +8,22 @@ URL: http://www.scorched3d.co.uk/ Source0: http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop -Patch0: %{name}-syslibs.patch -Patch1: %{name}-aclocal18.patch +Source2: %{name}-cvs-20050929-bins.tar.gz +Patch0: %{name}-cvs-20050929.patch +Patch1: %{name}-syslibs.patch +Patch2: %{name}-aclocal18.patch +Patch3: %{name}-gcc41.patch +Patch4: %{name}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK2-devel -BuildRequires: SDL_mixer-devel +BuildRequires: wxGTK-devel +BuildRequires: openal-devel +BuildRequires: freealut-devel BuildRequires: SDL_net-devel BuildRequires: ImageMagick BuildRequires: libGLU-devel BuildRequires: desktop-file-utils BuildRequires: expat-devel -BuildRequires: %{_bindir}/openal-config BuildRequires: autoconf BuildRequires: automake # Upstream naming compatibility @@ -45,12 +49,18 @@ find . -type d -name CVS | xargs rm -r rm -r autom4te.cache `find . -name Makefile` rm -r src/zlib `find src/XML ! -name "X*"` -%patch0 -p1 -%patch1 -grep -v configure autogen.sh | sh -x - +%patch0 -p1 -z .cvs +%patch1 -p1 -z .syslibs +%patch2 -p0 -z .aclocal18 +%patch3 -p1 -z .gcc41 +%patch4 -p0 -z .64bit +tar xvfz %{SOURCE2} +. autogen.sh %build +#we need to add -lalut, which in turn needs -lopenal otherwise configure fails +export LDFLAGS="-lalut -lopenal -lpthread" %configure \ --disable-dependency-tracking \ --datadir=%{_datadir}/games/%{name} \ From fedora-extras-commits at redhat.com Mon Feb 6 04:34:00 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 5 Feb 2006 23:34:00 -0500 Subject: rpms/libsexy/devel .cvsignore, 1.4, 1.5 libsexy.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200602060434.k164YWxq024945@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libsexy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24924 Modified Files: .cvsignore libsexy.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Nov 2005 05:57:29 -0000 1.4 +++ .cvsignore 6 Feb 2006 04:33:59 -0000 1.5 @@ -1 +1 @@ -libsexy-0.1.4.tar.gz +libsexy-0.1.6.tar.gz Index: libsexy.spec =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/libsexy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libsexy.spec 11 Nov 2005 05:57:29 -0000 1.4 +++ libsexy.spec 6 Feb 2006 04:33:59 -0000 1.5 @@ -1,5 +1,5 @@ Name: libsexy -Version: 0.1.4 +Version: 0.1.6 Release: 1%{?dist} Summary: Funky fresh graphical widgets for GTK+ 2 @@ -27,7 +27,7 @@ %setup -q %build -%configure --disable-static +%configure --disable-static --enable-gtk-doc make %{?_smp_mflags} %install @@ -49,11 +49,15 @@ %files devel %defattr(-,root,root,-) +%{_datadir}/gtk-doc/html/%{name} %{_includedir}/%{name} %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Feb 5 2006 Ignacio Vazquez-Abrams 0.1.6-1 +- Upstream update + * Wed Nov 9 2005 Ignacio Vazquez-Abrams 0.1.4-1 - Upstream update - Build with enchant (#172577) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Nov 2005 05:57:29 -0000 1.4 +++ sources 6 Feb 2006 04:33:59 -0000 1.5 @@ -1 +1 @@ -2fb4072a740b9ab4ad2ff5a323f7fd3d libsexy-0.1.4.tar.gz +495d8d986f0caa23b001f8e09d11eaf3 libsexy-0.1.6.tar.gz From fedora-extras-commits at redhat.com Mon Feb 6 10:12:27 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 6 Feb 2006 05:12:27 -0500 Subject: fedora-security/audit fc5,1.54,1.55 Message-ID: <200602061012.k16ACRLM004618@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4597 Modified Files: fc5 Log Message: Deal with some fc5 work; reping on some bz's and check rawhide, check some marked ** Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- fc5 3 Feb 2006 19:54:01 -0000 1.54 +++ fc5 6 Feb 2006 10:12:02 -0000 1.55 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060202 +Up to date CVE as of CVE email 20060205 Up to date FC5 as of FC5-Test2-RC 1. Removed packages with security issues that are no longer in FC5 @@ -15,9 +15,9 @@ ** are items that need attention -CVE-2006-0528 **evolution -CVE-2006-0496 VULNERABLE (mozilla) -CVE-2006-0496 VULNERABLE (firefox) +CVE-2006-0528 ** evolution [under investigation] +CVE-2006-0496 VULNERABLE (mozilla) not fixed upstream +CVE-2006-0496 VULNERABLE (firefox) not fixed upstream CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) CVE-2006-0405 version (libtiff, 3.8.0 only) @@ -51,13 +51,13 @@ CVE-2006-0292 VULNERABLE (mozilla) CVE-2006-0292 VULNERABLE (thunderbird) CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179 -CVE-2006-0236 ignore (thunderbird) windows only flaw -CVE-2006-0225 VULNERABLE (openssh) -CVE-2006-0208 VULNERABLE (php) -CVE-2006-0207 VULNERABLE (php) -CVE-2006-0200 VULNERABLE (php) -CVE-2006-0197 ** xorg-x11 -CVE-2006-0144 ** php-pear +CVE-2006-0236 ignore (thunderbird) windows only +CVE-2006-0225 VULNERABLE (openssh) fc4 bz#168167 +CVE-2006-0208 VULNERABLE (php) fc4 bz#178036 +CVE-2006-0207 VULNERABLE (php, fixed 5.1.2) +CVE-2006-0200 VULNERABLE (php, fixed 5.1.2) +CVE-2006-0197 ignore (xorg-x11) not an issue +CVE-2006-0144 version (php-pear, not 1.4.4) CVE-2006-0097 ignore (php) Windows only CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 VULNERABLE (kernel) bz#177916 @@ -70,7 +70,7 @@ CVE-2005-4685 VULNERABLE (mozilla) CVE-2005-4685 VULNERABLE (firefox) CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream -CVE-2005-4667 VULNERABLE (unzip) bz#178961 +CVE-2005-4667 VULNERABLE (unzip) fc4 bz#178961 CVE-2005-4639 version (kernel, fixed 2.6.15) CVE-2005-4636 version (openoffice.org, fixed 2.0.1) CVE-2005-4635 version (kernel, fixed 2.6.15) @@ -85,10 +85,10 @@ CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch CVE-2005-4134 ignore (mozilla) http://www.mozilla.org/security/history-title.html CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html -CVE-2005-4130 ** (HelixPlayer) no information available -CVE-2005-4126 ** (HelixPlayer) no information available +CVE-2005-4130 ** (HelixPlayer) no information yet available +CVE-2005-4126 ** (HelixPlayer) no information yet available CVE-2005-4077 version (curl, fixed 7.15.1) -CVE-2005-3964 VULNERABLE (openmotif) bz#177915 +CVE-2005-3964 VULNERABLE (openmotif) bz#177915:rawhide CVE-2005-3962 backport (perl) perl-5.8.7-CVE-2005-3962-bz174684.patch CVE-2005-3896 ignore (mozilla) recoverable DoS only CVE-2005-3883 version (php, fixed 5.1.1 at least) @@ -141,7 +141,7 @@ CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch CVE-2005-3623 version (kernel, fixed 2.6.14.5) CVE-2005-3582 version (ImageMagick) gentoo only -CVE-2005-3573 VULNERABLE (mailman, not fixed 2.1.6) bz#174166 +CVE-2005-3573 VULNERABLE (mailman, fixed 2.1.7) bz#174166:rawhide CVE-2005-3527 version (kernel, fixed 2.6.14 at least) CVE-2005-3402 ignore (thunderbird) mozilla say by design CVE-2005-3392 version (php, not 5.0) From fedora-extras-commits at redhat.com Mon Feb 6 10:35:38 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 6 Feb 2006 05:35:38 -0500 Subject: rpms/bidiv/devel .cvsignore, 1.2, 1.3 bidiv.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200602061036.k16AaBZk004721@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/bidiv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4699 Modified Files: .cvsignore bidiv.spec sources Log Message: remove `strip' from Makefile, to have meaningful debuginfo (BUG #180104) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bidiv/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Jan 2006 07:12:58 -0000 1.2 +++ .cvsignore 6 Feb 2006 10:35:38 -0000 1.3 @@ -1 +1,2 @@ bidiv-1.5.tgz +nostrip.patch.gz Index: bidiv.spec =================================================================== RCS file: /cvs/extras/rpms/bidiv/devel/bidiv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bidiv.spec 29 Jan 2006 07:12:58 -0000 1.1 +++ bidiv.spec 6 Feb 2006 10:35:38 -0000 1.2 @@ -1,9 +1,10 @@ Summary: Display logical Hebrew on unidirectional terminals Name: bidiv Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/ Source: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/%{name}-%{version}.tgz +Patch0: nostrip.patch.gz License: GPL Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +17,7 @@ %prep %setup -q -n bidiv +%patch -P 0 %build make PREFIX=%{buildroot} CC_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -38,6 +40,8 @@ # and what about %{_mandir}/he/man1/bidiv.1 ? ;) %changelog +* Sun Feb 5 2006 Dan Kenigsberg 1.5-2 +- remove `strip' from Makefile, to have meaningful debuginfo (BUG #180104) * Sat Jan 7 2006 Dan Kenigsberg 1.5-1 - new upstream version. * Mon Dec 26 2005 Dan Kenigsberg 1.4-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bidiv/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Jan 2006 07:12:58 -0000 1.2 +++ sources 6 Feb 2006 10:35:38 -0000 1.3 @@ -1 +1,2 @@ e1a951dac153c3998e6276e11f681ac4 bidiv-1.5.tgz +02f1b4a7429a9c4a19a68b21bbd05a0f nostrip.patch.gz From fedora-extras-commits at redhat.com Mon Feb 6 10:43:38 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 6 Feb 2006 05:43:38 -0500 Subject: rpms/bidiv/FC-4 .cvsignore, 1.2, 1.3 bidiv.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200602061044.k16AiB3A004815@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/bidiv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4794 Modified Files: .cvsignore bidiv.spec sources Log Message: remove `strip' from Makefile, to have meaningful debuginfo (BUG #180104) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bidiv/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Jan 2006 07:12:58 -0000 1.2 +++ .cvsignore 6 Feb 2006 10:43:38 -0000 1.3 @@ -1 +1,2 @@ bidiv-1.5.tgz +nostrip.patch.gz Index: bidiv.spec =================================================================== RCS file: /cvs/extras/rpms/bidiv/FC-4/bidiv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bidiv.spec 29 Jan 2006 07:12:58 -0000 1.1 +++ bidiv.spec 6 Feb 2006 10:43:38 -0000 1.2 @@ -1,9 +1,10 @@ Summary: Display logical Hebrew on unidirectional terminals Name: bidiv Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/ Source: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/%{name}-%{version}.tgz +Patch0: nostrip.patch.gz License: GPL Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +17,7 @@ %prep %setup -q -n bidiv +%patch -P 0 %build make PREFIX=%{buildroot} CC_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -38,6 +40,8 @@ # and what about %{_mandir}/he/man1/bidiv.1 ? ;) %changelog +* Sun Feb 5 2006 Dan Kenigsberg 1.5-2 +- remove `strip' from Makefile, to have meaningful debuginfo (BUG #180104) * Sat Jan 7 2006 Dan Kenigsberg 1.5-1 - new upstream version. * Mon Dec 26 2005 Dan Kenigsberg 1.4-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bidiv/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Jan 2006 07:12:58 -0000 1.2 +++ sources 6 Feb 2006 10:43:38 -0000 1.3 @@ -1 +1,2 @@ e1a951dac153c3998e6276e11f681ac4 bidiv-1.5.tgz +02f1b4a7429a9c4a19a68b21bbd05a0f nostrip.patch.gz From fedora-extras-commits at redhat.com Mon Feb 6 10:45:59 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 6 Feb 2006 05:45:59 -0500 Subject: rpms/bidiv/FC-3 .cvsignore, 1.2, 1.3 bidiv.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200602061046.k16AkWo3004888@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/bidiv/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4867 Modified Files: .cvsignore bidiv.spec sources Log Message: remove `strip' from Makefile, to have meaningful debuginfo (BUG #180104) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bidiv/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Jan 2006 07:12:58 -0000 1.2 +++ .cvsignore 6 Feb 2006 10:45:59 -0000 1.3 @@ -1 +1,2 @@ bidiv-1.5.tgz +nostrip.patch.gz Index: bidiv.spec =================================================================== RCS file: /cvs/extras/rpms/bidiv/FC-3/bidiv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bidiv.spec 29 Jan 2006 07:12:58 -0000 1.1 +++ bidiv.spec 6 Feb 2006 10:45:59 -0000 1.2 @@ -1,9 +1,10 @@ Summary: Display logical Hebrew on unidirectional terminals Name: bidiv Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/ Source: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/%{name}-%{version}.tgz +Patch0: nostrip.patch.gz License: GPL Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +17,7 @@ %prep %setup -q -n bidiv +%patch -P 0 %build make PREFIX=%{buildroot} CC_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -38,6 +40,8 @@ # and what about %{_mandir}/he/man1/bidiv.1 ? ;) %changelog +* Sun Feb 5 2006 Dan Kenigsberg 1.5-2 +- remove `strip' from Makefile, to have meaningful debuginfo (BUG #180104) * Sat Jan 7 2006 Dan Kenigsberg 1.5-1 - new upstream version. * Mon Dec 26 2005 Dan Kenigsberg 1.4-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bidiv/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Jan 2006 07:12:58 -0000 1.2 +++ sources 6 Feb 2006 10:45:59 -0000 1.3 @@ -1 +1,2 @@ e1a951dac153c3998e6276e11f681ac4 bidiv-1.5.tgz +02f1b4a7429a9c4a19a68b21bbd05a0f nostrip.patch.gz From fedora-extras-commits at redhat.com Mon Feb 6 11:46:26 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 6 Feb 2006 06:46:26 -0500 Subject: rpms/bluefish/devel bluefish.spec, 1.16, 1.17 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 Message-ID: <200602061146.k16BkwDQ006849@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6826 Modified Files: bluefish.spec sources .cvsignore Log Message: - update to 1.0.5 - include manpage Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- bluefish.spec 5 Sep 2005 17:26:31 -0000 1.16 +++ bluefish.spec 6 Feb 2006 11:46:25 -0000 1.17 @@ -1,5 +1,5 @@ Name: bluefish -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} Summary: GTK2 web development application for experienced users @@ -77,9 +77,14 @@ %{_datadir}/mime/packages/bluefish.xml %{_datadir}/mime-info/* %{_datadir}/pixmaps/* +%{_mandir}/man1/bluefish.1* %changelog +* Mon Feb 6 2006 Paul Howarth - 1.0.5-1 +- update to 1.0.5 +- include manpage + * Mon Sep 5 2005 Paul Howarth - 1.0.4-1 - update to 1.0.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 Sep 2005 17:26:31 -0000 1.7 +++ sources 6 Feb 2006 11:46:25 -0000 1.8 @@ -1 +1 @@ -8d5c1b7315cdc935aa024954093d2b32 bluefish-1.0.4.tar.bz2 +26701c09d41e5dea987155cdc9d0ac94 bluefish-1.0.5.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 5 Sep 2005 17:26:31 -0000 1.7 +++ .cvsignore 6 Feb 2006 11:46:25 -0000 1.8 @@ -1 +1 @@ -bluefish-1.0.4.tar.bz2 +bluefish-1.0.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 6 11:55:17 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 6 Feb 2006 06:55:17 -0500 Subject: rpms/bluefish/FC-4 bluefish.spec, 1.15, 1.16 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 Message-ID: <200602061155.k16Btos7007742@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7700 Modified Files: bluefish.spec sources .cvsignore Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bluefish.spec 7 Sep 2005 06:19:15 -0000 1.15 +++ bluefish.spec 6 Feb 2006 11:55:17 -0000 1.16 @@ -1,5 +1,5 @@ Name: bluefish -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} Summary: GTK2 web development application for experienced users @@ -77,9 +77,14 @@ %{_datadir}/mime/packages/bluefish.xml %{_datadir}/mime-info/* %{_datadir}/pixmaps/* +%{_mandir}/man1/bluefish.1* %changelog +* Mon Feb 6 2006 Paul Howarth - 1.0.5-1 +- update to 1.0.5 +- include manpage + * Mon Sep 5 2005 Paul Howarth - 1.0.4-1 - update to 1.0.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Sep 2005 06:19:15 -0000 1.7 +++ sources 6 Feb 2006 11:55:17 -0000 1.8 @@ -1 +1 @@ -8d5c1b7315cdc935aa024954093d2b32 bluefish-1.0.4.tar.bz2 +26701c09d41e5dea987155cdc9d0ac94 bluefish-1.0.5.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Sep 2005 06:19:15 -0000 1.7 +++ .cvsignore 6 Feb 2006 11:55:17 -0000 1.8 @@ -1 +1 @@ -bluefish-1.0.4.tar.bz2 +bluefish-1.0.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 6 11:55:18 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Feb 2006 06:55:18 -0500 Subject: rpms/moin/devel moin-1.5.2-config.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 moin.spec, 1.5, 1.6 sources, 1.4, 1.5 moin-1.3.5-config.patch, 1.1, NONE Message-ID: <200602061155.k16BtoDi007747@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7698 Modified Files: .cvsignore moin.spec sources Added Files: moin-1.5.2-config.patch Removed Files: moin-1.3.5-config.patch Log Message: Update to 1.5.2. moin-1.5.2-config.patch: --- NEW FILE moin-1.5.2-config.patch --- diff -Naupr moin-1.5.2.orig/MoinMoin/multiconfig.py moin-1.5.2/MoinMoin/multiconfig.py --- moin-1.5.2.orig/MoinMoin/multiconfig.py 2006-02-04 13:31:37.000000000 +0100 +++ moin-1.5.2/MoinMoin/multiconfig.py 2006-02-06 11:45:22.000000000 +0100 @@ -353,13 +353,13 @@ class DefaultConfig: 'edit_on_doubleclick': 0, 'remember_last_visit': 0, 'show_nonexist_qm': nonexist_qm, - 'show_page_trail': 1, + 'show_page_trail': 0, 'show_toolbar': 1, 'show_topbottom': 0, 'show_fancy_diff': 1, 'wikiname_add_spaces': 0, 'remember_me': 1, - 'want_trivial': 0, + 'want_trivial': 1, } # don't let the user change those # user_checkbox_disable = ['disabled', 'want_trivial'] diff -Naupr moin-1.5.2.orig/wiki/config/wikiconfig.py moin-1.5.2/wiki/config/wikiconfig.py --- moin-1.5.2.orig/wiki/config/wikiconfig.py 2006-02-04 22:20:20.000000000 +0100 +++ moin-1.5.2/wiki/config/wikiconfig.py 2006-02-06 11:46:18.000000000 +0100 @@ -65,14 +65,14 @@ class Config(DefaultConfig): # Where your mutable wiki pages are. You want to make regular # backups of this directory. - data_dir = './data/' + data_dir = '../data/' # Where read-only system and help page are. You might want to share # this directory between several wikis. When you update MoinMoin, # you can safely replace the underlay directory with a new one. This # directory is part of MoinMoin distribution, you don't have to # backup it. - data_underlay_dir = './underlay/' + data_underlay_dir = '../underlay/' # This must be '/wiki' for twisted and standalone. For CGI, it should # match your Apache Alias setting. @@ -123,6 +123,7 @@ class Config(DefaultConfig): #u'%(page_front_page)s', u'RecentChanges', u'FindPage', + u'SiteNavigation', u'HelpContents', ] Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Aug 2005 07:35:18 -0000 1.4 +++ .cvsignore 6 Feb 2006 11:55:17 -0000 1.5 @@ -1 +1 @@ -moin-1.3.5.tar.gz +moin-1.5.2.tar.gz Index: moin.spec =================================================================== RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- moin.spec 19 Dec 2005 09:14:40 -0000 1.5 +++ moin.spec 6 Feb 2006 11:55:17 -0000 1.6 @@ -1,13 +1,13 @@ Summary: MoinMoin is a Python clone of WikiWiki Name: moin -Version: 1.3.5 -Release: 3%{?dist} +Version: 1.5.2 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://moinmoin.wikiwikiweb.de/ Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz Source1: README-rpm -Patch0: moin-1.3.5-config.patch +Patch0: moin-1.5.2-config.patch Patch1: moin-1.3.5-xml_newline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -44,7 +44,7 @@ %files %defattr(-,root,root,0755) -%doc README README-rpm docs/CHANGES docs/INSTALL.html docs/UPDATE.html +%doc README README-rpm docs/CHANGES* docs/INSTALL.html docs/README.migration %doc docs/licenses/ %{_bindir}/* %{_prefix}/lib/python?.?/site-packages/MoinMoin/ @@ -52,6 +52,11 @@ %changelog +* Mon Feb 6 2006 Matthias Saou 1.5.2-1 +- Update to 1.5.2. +- Update config patch. +- Update %%doc files. + * Sun Dec 18 2005 Tommy Reynolds 1.3.5-3 - Remove extraneous '\' from XML output, so that .. does not generate '\' 'n' outside of any markup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/moin/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Aug 2005 07:35:18 -0000 1.4 +++ sources 6 Feb 2006 11:55:17 -0000 1.5 @@ -1 +1 @@ -7194abf16cd6fe24c046013ce3a7c13d moin-1.3.5.tar.gz +689ed7aa9619aa207398b996d68b4b87 moin-1.5.2.tar.gz --- moin-1.3.5-config.patch DELETED --- From fedora-extras-commits at redhat.com Mon Feb 6 11:57:41 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 6 Feb 2006 06:57:41 -0500 Subject: rpms/bluefish/FC-3 bluefish.spec, 1.12, 1.13 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 Message-ID: <200602061158.k16BwDwR007856@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7835 Modified Files: bluefish.spec sources .cvsignore Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/bluefish.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bluefish.spec 7 Sep 2005 06:20:53 -0000 1.12 +++ bluefish.spec 6 Feb 2006 11:57:41 -0000 1.13 @@ -1,5 +1,5 @@ Name: bluefish -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} Summary: GTK2 web development application for experienced users @@ -77,9 +77,14 @@ %{_datadir}/mime/packages/bluefish.xml %{_datadir}/mime-info/* %{_datadir}/pixmaps/* +%{_mandir}/man1/bluefish.1* %changelog +* Mon Feb 6 2006 Paul Howarth - 1.0.5-1 +- update to 1.0.5 +- include manpage + * Mon Sep 5 2005 Paul Howarth - 1.0.4-1 - update to 1.0.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Sep 2005 06:20:53 -0000 1.7 +++ sources 6 Feb 2006 11:57:41 -0000 1.8 @@ -1 +1 @@ -8d5c1b7315cdc935aa024954093d2b32 bluefish-1.0.4.tar.bz2 +26701c09d41e5dea987155cdc9d0ac94 bluefish-1.0.5.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Sep 2005 06:20:53 -0000 1.7 +++ .cvsignore 6 Feb 2006 11:57:41 -0000 1.8 @@ -1 +1 @@ -bluefish-1.0.4.tar.bz2 +bluefish-1.0.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 6 13:20:27 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Feb 2006 08:20:27 -0500 Subject: rpms/python-nltk/FC-3 python-nltk.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200602061320.k16DKxWO011701@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/python-nltk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11681 Modified Files: python-nltk.spec sources Log Message: Downgrade to 1.4.2 for FC3 only, for Python compatibility Index: python-nltk.spec =================================================================== RCS file: /cvs/extras/rpms/python-nltk/FC-3/python-nltk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-nltk.spec 17 Nov 2005 05:22:25 -0000 1.1 +++ python-nltk.spec 6 Feb 2006 13:20:27 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-nltk -Version: 1.4.4 +Version: 1.4.2 Release: 1%{?dist} Summary: Natural Language Toolkit @@ -14,7 +14,7 @@ BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: python-numarray, tkinter +Requires: python-numeric, tkinter %description The Natural Language Toolkit is a Python package that simplifies the @@ -64,5 +64,8 @@ %changelog -* Sun Sep 11 2005 Michel Salim - 1.4.4-1 +* Mon Feb 6 2006 Michel Salim - 1.4.2-1 +- Downgrade to 1.4.2 for FC3 only, to match older version of Python installed + +* Sun Sep 11 2005 Michel Salim - 1.4.4-1 - Initial package Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-nltk/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Nov 2005 05:22:25 -0000 1.2 +++ sources 6 Feb 2006 13:20:27 -0000 1.3 @@ -1 +1 @@ -fb402d42d71844fe4483affa100814e5 nltk-1.4.4.tar.gz +f24e6ac9c2152e9cf6f9fa09e259d783 nltk-1.4.2.tar.gz From fedora-extras-commits at redhat.com Mon Feb 6 13:41:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Feb 2006 08:41:53 -0500 Subject: rpms/koffice/devel koffice.spec,1.27,1.28 Message-ID: <200602061342.k16DgPDD011825@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11806 Modified Files: koffice.spec Log Message: - reanable ruby Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- koffice.spec 4 Feb 2006 00:36:58 -0000 1.27 +++ koffice.spec 6 Feb 2006 13:41:53 -0000 1.28 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -60,8 +60,7 @@ BuildRequires: libGL-devel libGLU-devel BuildRequires: libXi-devel BuildRequires: readline-devel -# build without kcross ruby support till I get feedback for #179835 -#BuildRequires: ruby ruby-devel +BuildRequires: ruby ruby-devel %description KOffice - Integrated Office Suite @@ -781,7 +780,7 @@ %{_libdir}/kde3/krosskexidb.* %{_libdir}/kde3/krosskritacore.* %{_libdir}/kde3/krosspython.* -#%{_libdir}/kde3/krossruby.* +%{_libdir}/kde3/krossruby.* %{_libdir}/libkrossapi.so.* %{_libdir}/libkrossmain.so.* %{_datadir}/config/kexirc @@ -913,6 +912,10 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Mon Feb 06 2006 Andreas Bierfert +1.4.90-2 +- enable ruby again (bug #179835) + * Wed Feb 01 2006 Andreas Bierfert 1.4.90-1 - version upgrade From fedora-extras-commits at redhat.com Mon Feb 6 13:53:28 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 08:53:28 -0500 Subject: rpms/gnomebaker - New directory Message-ID: <200602061353.k16DrUcM011960@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11952/gnomebaker Log Message: Directory /cvs/extras/rpms/gnomebaker added to the repository From fedora-extras-commits at redhat.com Mon Feb 6 13:53:33 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 08:53:33 -0500 Subject: rpms/gnomebaker/devel - New directory Message-ID: <200602061353.k16DraOJ011975@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11952/gnomebaker/devel Log Message: Directory /cvs/extras/rpms/gnomebaker/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 6 13:53:48 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 08:53:48 -0500 Subject: rpms/gnomebaker Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602061353.k16DroPf012009@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11997 Added Files: Makefile import.log Log Message: Setup of module gnomebaker --- NEW FILE Makefile --- # Top level Makefile for module gnomebaker all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 6 13:53:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 08:53:53 -0500 Subject: rpms/gnomebaker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602061353.k16DrtIr012029@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11997/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnomebaker --- NEW 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 Feb 6 13:54:29 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 08:54:29 -0500 Subject: rpms/gnomebaker import.log,1.1,1.2 Message-ID: <200602061355.k16Dt1a5012097@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12063 Modified Files: import.log Log Message: auto-import gnomebaker-0.5.1-1 on branch devel from gnomebaker-0.5.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnomebaker/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Feb 2006 13:53:47 -0000 1.1 +++ import.log 6 Feb 2006 13:54:29 -0000 1.2 @@ -0,0 +1 @@ +gnomebaker-0_5_1-1:HEAD:gnomebaker-0.5.1-1.src.rpm:1139234066 From fedora-extras-commits at redhat.com Mon Feb 6 13:54:35 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 08:54:35 -0500 Subject: rpms/gnomebaker/devel gnomebaker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602061355.k16Dt7MJ012102@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12063/devel Modified Files: .cvsignore sources Added Files: gnomebaker.spec Log Message: auto-import gnomebaker-0.5.1-1 on branch devel from gnomebaker-0.5.1-1.src.rpm --- NEW FILE gnomebaker.spec --- Name: gnomebaker Version: 0.5.1 Release: 1%{?dist} Summary: Gnome CD/DVD burner Group: Applications/Multimedia License: GPL URL: http://%{name}.sourceforge.net/v2/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.10.0 BuildRequires: libglade2-devel BuildRequires: gstreamer08-devel BuildRequires: gettext BuildRequires: scrollkeeper BuildRequires: desktop-file-utils Requires: dvd+rw-tools Requires: cdrecord Requires: mkisofs Requires: cdda2wav Requires(post): scrollkeeper Requires(postun): scrollkeeper %description CD/DVD burner designed for the GNOME desktop. %prep %setup -q chmod 644 AUTHORS TODO %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} # Remove duplicate docs. rm -rf $RPM_BUILD_ROOT/usr/doc/%{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 %clean rm -rf $RPM_BUILD_ROOT %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %postun scrollkeeper-update -q || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING TODO %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/omf/%{name}/ %{_datadir}/gnome/help/%{name}/ %changelog * Sat Feb 4 2006 Brian Pepple - 0.5.1-1 - Drop aclocal & autoconf calls. - Change gstreamer-devel to gstreamer08-devel for FC5. - Add dist tag. - Correct permissions on AUTHORS & TODO. - Drop help & desktop patchs. - Update 0.5.1. * Wed Oct 19 2005 Brian Pepple - 0.5.0-3 - Edit configure.in to use RPM_OPT_FLAGS. (Thanks to Adrian Reber) * Mon Oct 17 2005 Brian Pepple - 0.5.0-2 - Rebuild config. & make files w/ aclocal & autconf, so builds on FC5. * Sun Oct 16 2005 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomebaker/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Feb 2006 13:53:53 -0000 1.1 +++ .cvsignore 6 Feb 2006 13:54:35 -0000 1.2 @@ -0,0 +1 @@ +gnomebaker-0.5.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomebaker/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Feb 2006 13:53:53 -0000 1.1 +++ sources 6 Feb 2006 13:54:35 -0000 1.2 @@ -0,0 +1 @@ +45aef11c945904edc9fcf73e40eb2785 gnomebaker-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 6 13:58:23 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 08:58:23 -0500 Subject: owners owners.list,1.613,1.614 Message-ID: <200602061358.k16Dwt3O012220@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12200 Modified Files: owners.list Log Message: Add gnomebaker to list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.613 retrieving revision 1.614 diff -u -r1.613 -r1.614 --- owners.list 5 Feb 2006 20:22:28 -0000 1.613 +++ owners.list 6 Feb 2006 13:58:22 -0000 1.614 @@ -311,6 +311,7 @@ Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| +Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Feb 6 14:02:12 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 09:02:12 -0500 Subject: rpms/gnomebaker/devel gnomebaker.spec,1.1,1.2 Message-ID: <200602061402.k16E2ilv014062@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14038 Modified Files: gnomebaker.spec Log Message: Bump release Index: gnomebaker.spec =================================================================== RCS file: /cvs/extras/rpms/gnomebaker/devel/gnomebaker.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnomebaker.spec 6 Feb 2006 13:54:35 -0000 1.1 +++ gnomebaker.spec 6 Feb 2006 14:02:12 -0000 1.2 @@ -1,6 +1,6 @@ Name: gnomebaker Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnome CD/DVD burner Group: Applications/Multimedia @@ -76,6 +76,9 @@ %changelog +* Mon Feb 6 2006 Brian Pepple - 0.5.1-2 +- Bump release. + * Sat Feb 4 2006 Brian Pepple - 0.5.1-1 - Drop aclocal & autoconf calls. - Change gstreamer-devel to gstreamer08-devel for FC5. From fedora-extras-commits at redhat.com Mon Feb 6 14:09:30 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Mon, 6 Feb 2006 09:09:30 -0500 Subject: rpms/gtkglext/devel .cvsignore, 1.2, 1.3 gtkglext.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200602061410.k16EA2IF014152@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglext/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14131 Modified Files: .cvsignore gtkglext.spec sources Log Message: - Upstream update. - Spec file cleanup. - Disable static libs. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkglext/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:43 -0000 1.2 +++ .cvsignore 6 Feb 2006 14:09:29 -0000 1.3 @@ -1 +1 @@ -gtkglext-1.0.6.tar.bz2 +gtkglext-1.2.0.tar.bz2 Index: gtkglext.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglext/devel/gtkglext.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtkglext.spec 5 Jan 2006 09:26:48 -0000 1.6 +++ gtkglext.spec 6 Feb 2006 14:09:29 -0000 1.7 @@ -1,17 +1,14 @@ -# -*- rpm-spec -*- - -%define base_version 1.0.6 %define api_version 1.0 Summary: OpenGL Extension to GTK Name: gtkglext -Version: %{base_version} -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://gtkglext.sourceforge.net/ -Source0: ftp://dl.sourceforge.net/pub/sourceforge/gtkglext/gtkglext-%{version}.tar.bz2 +Source0: http://dl.sourceforge.net/sourceforge/gtkglext/gtkglext-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -34,6 +31,7 @@ Requires: %{name} = %{version} Requires: gtk2-devel +Requires: libGL-devel %description devel The gtkglext-devel package contains the header files, static libraries, @@ -43,7 +41,7 @@ %setup -q -n gtkglext-%{version} %build -%configure --disable-gtk-doc +%configure --disable-gtk-doc --disable-static make %install @@ -72,13 +70,17 @@ %{_includedir}/* %{_libdir}/gtkglext-%{api_version} %{_libdir}/lib*.so -%{_libdir}/lib*.a -%{_libdir}/lib*.la +%{_libdir}/lib*a %{_libdir}/pkgconfig/* %{_datadir}/aclocal/* %doc %{_datadir}/gtk-doc/html/* %changelog +* Mon Feb 06 2006 Ralf Cors??pius - 1.2.0-1 +- Upstream update. +- Spec file cleanup. +- Disable static libs. + * Thu Jan 05 2006 Ralf Corsepius - 1.0.6-3 - Add %%dist. - Adaptations to modular X . Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkglext/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:43 -0000 1.2 +++ sources 6 Feb 2006 14:09:30 -0000 1.3 @@ -1 +1 @@ -e347e028dfe98d69c5995f547108db77 gtkglext-1.0.6.tar.bz2 +ed7ba24ce06a8630c07f2d0ee5f04ab4 gtkglext-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 6 15:01:40 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Feb 2006 10:01:40 -0500 Subject: rpms/scorched3d/devel scorched3d-help.patch, NONE, 1.1 scorched3d-openal.patch, NONE, 1.1 scorched3d.spec, 1.7, 1.8 Message-ID: <200602061502.k16F2DJj016233@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16182 Modified Files: scorched3d.spec Added Files: scorched3d-help.patch scorched3d-openal.patch Log Message: scorched3d WIP scorched3d-help.patch: --- NEW FILE scorched3d-help.patch --- --- scorched/src/scorched/MainDialog.cpp.help 2006-02-06 12:24:58.000000000 +0100 +++ scorched/src/scorched/MainDialog.cpp 2006-02-06 12:25:42.000000000 +0100 @@ -131,7 +131,7 @@ #ifdef __DARWIN__ system(formatString("open %s", url)); #else - system(formatString("mozilla %s", url)); + system(formatString("htmlview %s&", url)); dialogMessage("Web site location", "%s", url); #endif // __DARWIN__ #endif // _WIN32 scorched3d-openal.patch: --- NEW FILE scorched3d-openal.patch --- --- scorched/configure.ac.openal 2006-02-06 10:55:19.000000000 +0100 +++ scorched/configure.ac 2006-02-06 10:55:31.000000000 +0100 @@ -114,7 +114,7 @@ if test x"$use_static_openal" = x"yes"; then LIBS="$LIBS /usr/local/lib/libopenal.a" else - LIBS="$LIBS `$OPENAL_CONFIG --libs`" + LIBS="$LIBS `$OPENAL_CONFIG --libs` -lalut" fi CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`" Index: scorched3d.spec =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scorched3d.spec 5 Feb 2006 21:58:44 -0000 1.7 +++ scorched3d.spec 6 Feb 2006 15:01:40 -0000 1.8 @@ -1,6 +1,6 @@ Name: scorched3d Version: 39.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games @@ -14,6 +14,8 @@ Patch2: %{name}-aclocal18.patch Patch3: %{name}-gcc41.patch Patch4: %{name}-64bit.patch +Patch5: %{name}-openal.patch +Patch6: %{name}-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel @@ -54,13 +56,13 @@ %patch2 -p0 -z .aclocal18 %patch3 -p1 -z .gcc41 %patch4 -p0 -z .64bit +%patch5 -p1 -z .openal +%patch6 -p1 -z .help tar xvfz %{SOURCE2} . autogen.sh %build -#we need to add -lalut, which in turn needs -lopenal otherwise configure fails -export LDFLAGS="-lalut -lopenal -lpthread" %configure \ --disable-dependency-tracking \ --datadir=%{_datadir}/games/%{name} \ @@ -106,6 +108,15 @@ %changelog +* Mon Feb 6 2006 39.1-2 +- upgrade to CVS snapshot of 20050929, as Debian does, this fixes a few + internetplay bugs and allows compilation with wxGTK 2.6 +- fix gcc41 compilation +- fix 64 bit compilation (courtesy debian-ppc-64) +- fix compile with openal-0.9 +- use htmlview for helpfile viewing instead of hardcoded mozilla, + run this in background so the game doesn't freeze + * Sat Oct 8 2005 Ville Skytt?? - 39.1-1 - 39.1. - Avoid aclocal >= 1.8 warnings. From fedora-extras-commits at redhat.com Mon Feb 6 16:36:28 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 11:36:28 -0500 Subject: rpms/mod_suphp/devel .cvsignore, 1.2, 1.3 mod_suphp.spec, 1.6, 1.7 sources, 1.2, 1.3 suphp.conf, 1.1, 1.2 Message-ID: <200602061637.k16Gb1i4018537@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18514 Modified Files: .cvsignore mod_suphp.spec sources suphp.conf Log Message: * Mon Feb 06 2006 Andreas Thienemann 0.6.1-1 - Updated to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2005 20:21:49 -0000 1.2 +++ .cvsignore 6 Feb 2006 16:36:27 -0000 1.3 @@ -1 +1,6 @@ -suphp-0.5.2.tar.gz +suphp-0.6.1.tar.gz +README.fedora +mod_suphp-0.6.1-userdir.patch +mod_suphp-0.6.1-AddHandler.patch +suphp.conf +mod_suphp.conf Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_suphp.spec 23 Aug 2005 15:13:10 -0000 1.6 +++ mod_suphp.spec 6 Feb 2006 16:36:27 -0000 1.7 @@ -1,18 +1,27 @@ # Depending on what version of Fedora we're on, use a different php binary -%if "%fedora" >= "4" - %define php /usr/bin/php-cgi +%if 0%{?fedora} + %if "%fedora" >= "4" + %define php /usr/bin/php-cgi + %else + %define php /usr/bin/php + %endif %else %define php /usr/bin/php %endif + Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp -Version: 0.5.2 -Release: 8%{?dist} +Version: 0.6.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz Source1: suphp.conf +Source2: mod_suphp.conf +Source3: README.fedora +Patch0: mod_suphp-0.6.1-userdir.patch +Patch1: mod_suphp-0.6.1-AddHandler.patch URL: http://www.suphp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php @@ -27,16 +36,20 @@ %prep %setup -q -n suphp-%{version} +%patch0 -p 1 -b .userdir +%patch1 -p 1 -b .AddHandler %build +echo "Building mod_suphp with %{php} as PHP interpreter" %configure \ + --with-apxs=/usr/sbin/apxs \ + --with-apr=/usr/bin/apr-config \ --with-apache-user=apache \ --with-min-uid=500 \ --with-min-gid=500 \ --with-php=%{php} \ --with-logfile=/var/log/httpd/suphp_log \ - --with-setid-mode=owner \ - --disable-checkpath + --with-setid-mode=owner pushd src make %{?_smp_mflags} suphp @@ -48,25 +61,36 @@ popd %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%{__install} -c -m 4755 -D src/suphp $RPM_BUILD_ROOT%{_sbindir}/suphp -%{__install} -m 755 -D src/apache2/mod_suphp.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/mod_suphp.so +%{__install} -c -m 4755 -D src/suphp %{buildroot}%{_sbindir}/suphp +%{__install} -m 755 -D src/apache2/mod_suphp.so %{buildroot}%{_libdir}/httpd/modules/mod_suphp.so -# Install the config file -%{__install} -m 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/suphp.conf +# Install the config files +sed -e 's@###PHP-BIN###@%{php}@' %{SOURCE1} > suphp.conf +%{__install} -m 644 -D suphp.conf %{buildroot}%{_sysconfdir}/suphp.conf +%{__install} -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf + +# Rename docs +cp doc/CONFIG CONFIG.suphp +cp doc/apache/CONFIG CONFIG.apache +cp %{SOURCE3} README.fedora %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc README COPYING -%{_sbindir}/suphp +%doc README COPYING CONFIG.suphp CONFIG.apache README.fedora +%attr (4755, root, root) %{_sbindir}/suphp %{_libdir}/httpd/modules/*.so -%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf +%config(noreplace) %{_sysconfdir}/suphp.conf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_suphp.conf %changelog +* Mon Feb 06 2006 Andreas Thienemann 0.6.1-1 +- Updated to 0.6.1 + * Tue Jul 09 2005 Andreas Thienemann 0.5.2-8 - Added a dependency on a specific httpd-mmn Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2005 20:21:49 -0000 1.2 +++ sources 6 Feb 2006 16:36:27 -0000 1.3 @@ -1 +1,6 @@ -337909e87027af124052baddddbd2994 suphp-0.5.2.tar.gz +7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz +4d95b68cc54bc401ec5b4005baf0ad51 README.fedora +5252fb24e364451c1ffb0d3e112a61ba mod_suphp-0.6.1-userdir.patch +33939dd30a5271a7d9daeb2b362dd11e mod_suphp-0.6.1-AddHandler.patch +b7cbd9c5cea2249625018629b86a2a11 suphp.conf +2c4c073c47ba34ef72293bdaff693a98 mod_suphp.conf Index: suphp.conf =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/suphp.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- suphp.conf 30 Jun 2005 20:21:49 -0000 1.1 +++ suphp.conf 6 Feb 2006 16:36:27 -0000 1.2 @@ -1,32 +1,49 @@ -# This is the Apache server configuration file providing suPHP support.. -# It contains the configuration directives to instruct the server how to -# serve php pages while switching to the user context before rendering. -# For directives see - -LoadModule suphp_module modules/mod_suphp.so - -# To use suPHP to parse PHP-Files -#AddHandler x-httpd-php .php -#AddHandler x-httpd-php .php .php4 .php3 .phtml - -# This option tells mod_suphp if a PHP-script requested on this server (or -# VirtualHost) should be run with the PHP-interpreter or returned to the -# browser "as it is". -suPHP_Engine off - - -# This option tells mod_suphp which path to pass on to the PHP-interpreter -# (by setting the PHPRC environment variable). -# Do *NOT* refer to a file but to the directory the file resists in. -# -# E.g.: If you want to use "/path/to/server/config/php.ini", use "suPHP_Config -# /path/to/server/config". -# -# If you don't use this option, PHP will use its compiled in default path. -#suPHP_ConfigPath /etc - - -# If you compiled suphp with setid-mode "force" or "paranoid", you can -# specify the user- and groupname to run PHP-scripts with. -# Example: suPHP_UserGroup foouser bargroup -# suPHP_UserGroup apache apache +[global] +;Path to logfile +logfile=/var/log/suphp.log + +;Loglevel +loglevel=info + +;User Apache is running as +webserver_user=apache + +;Path all scripts have to be in +docroot=/ + +;Path to chroot() to before executing script +;chroot=/mychroot + +; Security options +allow_file_group_writeable=false +allow_file_others_writeable=false +allow_directory_group_writeable=false +allow_directory_others_writeable=false + +;Check wheter script is within DOCUMENT_ROOT +check_vhost_docroot=true + +;Send minor error messages to browser +errors_to_browser=true + +;PATH environment variable +env_path=/bin:/usr/bin + +;Umask to set, specify in octal notation +umask=0077 + +; Minimum UID +min_uid=500 + +; Minimum GID +min_gid=500 + +; Use correct permissions for mod_userdir sites +handle_userdir=true + +[handlers] +;Handler for php-scripts +x-httpd-php=php:###PHP-BIN### + +;Handler for CGI-scripts +x-suphp-cgi=execute:!self From fedora-extras-commits at redhat.com Mon Feb 6 16:40:00 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 11:40:00 -0500 Subject: rpms/mod_suphp/devel README.fedora, NONE, 1.1 mod_suphp-0.6.1-userdir.patch, NONE, 1.1 mod_suphp.conf, NONE, 1.1 sources, 1.3, 1.4 Message-ID: <200602061640.k16GeX9k018594@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18567 Modified Files: sources Added Files: README.fedora mod_suphp-0.6.1-userdir.patch mod_suphp.conf Log Message: * Mon Feb 06 2006 Andreas Thienemann 0.6.1-1 - Updated to 0.6.1 --- NEW FILE README.fedora --- In order to activate mod_suphp support, /etc/httpd/conf.d/mod_suphp.conf has to be edited. The commented line "#AddHandler x-httpd-php .php" has to be uncommented, for mod_suphp to work. After a restart of the httpd, php scripts should be executed with the rights of the user owning them. In case you do need mod_php support for a certain virtual host or directory, you can selectively disable mod_suphp and fall back to mod_php: suPHP_Engine off RemoveHandler .php php_admin_flag engine on php_admin_flag register_globals on This should do the trick nicely. The register_globals flag is purely optional and should be avoided if possibly. Should you require mod_userdir support, in order to enable ~user URLs, you should set check_vhost_docroot=false in the /etc/suphp.conf file, as currently suphp would fail with a incorrect vhost. mod_suphp-0.6.1-userdir.patch: --- NEW FILE mod_suphp-0.6.1-userdir.patch --- >From miles at lubin.us Sat Dec 3 01:21:51 2005 From: miles at lubin.us (Miles Lubin) Date: Sat Dec 3 01:23:25 2005 Subject: [suPHP] mod_userdir patch for 0.6.1 Message-ID: <4390E51F.3080506 at lubin.us> Attached is the mod_userdir patch updated to 0.6.1. The patch allows suphp to correctly handle permissions with user sites, generated by mod_suphp; instead of using the permissions of the main site for force and paranoid mode, it will use the permissions of the correct user. Changes from 0.6.0 patch: - handle_userdir is enabled by default, set handle_userdir=false in /etc/suphp.conf to disable it - check the length of the url argument in checkUserDir() (a theoretical security issue, though not exploitable) - made the code more conforming to the suphp's coding style Miles Lubin -------------- next part -------------- diff -ur suphp-0.6.1/doc/CONFIG suphp-0.6.1-userdir/doc/CONFIG --- suphp-0.6.1/doc/CONFIG 2005-11-26 14:45:49.000000000 -0500 +++ suphp-0.6.1-userdir/doc/CONFIG 2005-12-02 15:07:41.000000000 -0500 @@ -95,6 +95,11 @@ Minimum GID allowed to execute scripts. Defaults to compile-time value. +handle_userdir: + Handle sites created by mod_userdir. + Scripts on userdir sites will be executed with the permissions + of the owner of the site. This option only affects force and paranoid mode. + This option is enabled by default. 3. Handlers diff -ur suphp-0.6.1/doc/suphp.conf-example suphp-0.6.1-userdir/doc/suphp.conf-example --- suphp-0.6.1/doc/suphp.conf-example 2005-11-26 14:45:49.000000000 -0500 +++ suphp-0.6.1-userdir/doc/suphp.conf-example 2005-12-02 15:07:41.000000000 -0500 @@ -38,6 +38,8 @@ ; Minimum GID min_gid=100 +; Use correct permissions for mod_userdir sites +handle_userdir=true [handlers] ;Handler for php-scripts diff -ur suphp-0.6.1/src/Application.cpp suphp-0.6.1-userdir/src/Application.cpp --- suphp-0.6.1/src/Application.cpp 2005-11-26 14:45:49.000000000 -0500 +++ suphp-0.6.1-userdir/src/Application.cpp 2005-12-02 17:18:27.000000000 -0500 @@ -19,6 +19,7 @@ */ #include +#include #include "config.h" @@ -300,29 +301,33 @@ // Paranoid and force mode #if (defined(OPT_USERGROUP_PARANOID) || defined(OPT_USERGROUP_FORCE)) - std::string targetUsername, targetGroupname; - try { - targetUsername = environment.getVar("SUPHP_USER"); - targetGroupname = environment.getVar("SUPHP_GROUP"); - } catch (KeyNotFoundException& e) { - throw SecurityException( + if (config.getHandleUserdir() && checkUserDir(environment.getVar("SUPHP_URI"),targetUser)) { + targetGroup = targetUser.getGroupInfo(); + } else { + std::string targetUsername, targetGroupname; + try { + targetUsername = environment.getVar("SUPHP_USER"); + targetGroupname = environment.getVar("SUPHP_GROUP"); + } catch (KeyNotFoundException& e) { + throw SecurityException( "Environment variable SUPHP_USER or SUPHP_GROUP not set", __FILE__, __LINE__); - } + } - if (targetUsername[0] == '#' && targetUsername.find_first_not_of( + if (targetUsername[0] == '#' && targetUsername.find_first_not_of( "0123456789", 1) == std::string::npos) { - targetUser = api.getUserInfo(Util::strToInt(targetUsername.substr(1))); - } else { - targetUser = api.getUserInfo(targetUsername); - } + targetUser = api.getUserInfo(Util::strToInt(targetUsername.substr(1))); + } else { + targetUser = api.getUserInfo(targetUsername); + } - if (targetGroupname[0] == '#' && targetGroupname.find_first_not_of( + if (targetGroupname[0] == '#' && targetGroupname.find_first_not_of( "0123456789", 1) == std::string::npos) { - targetGroup = api.getGroupInfo( + targetGroup = api.getGroupInfo( Util::strToInt(targetGroupname.substr(1))); - } else { - targetGroup = api.getGroupInfo(targetGroupname); + } else { + targetGroup = api.getGroupInfo(targetGroupname); + } } #endif // OPT_USERGROUP_PARANOID || OPT_USERGROUP_FORCE @@ -473,6 +478,28 @@ } } +bool suPHP::Application::checkUserDir(const std::string& url, UserInfo& user) const { + + if (url.length() <= 2 || url[1] != '~') + return false; + + API& api = API_Helper::getSystemAPI(); + std::string topDir; + std::istringstream strm(url); + + for (int i = 0; i < 2; i++) + if (!std::getline(strm, topDir, '/')) + return false; + + std::string userName = topDir.substr(1,topDir.length()); + + try { + user = api.getUserInfo(userName); + return true; + } catch (LookupException& e) { + return false; + } +} int main(int argc, char **argv) { try { diff -ur suphp-0.6.1/src/Application.hpp suphp-0.6.1-userdir/src/Application.hpp --- suphp-0.6.1/src/Application.hpp 2005-11-26 14:45:49.000000000 -0500 +++ suphp-0.6.1-userdir/src/Application.hpp 2005-12-02 15:07:41.000000000 -0500 @@ -39,6 +39,7 @@ #include "SystemException.hpp" #include "SoftException.hpp" #include "SecurityException.hpp" +#include "UserInfo.hpp" namespace suPHP { /** @@ -107,6 +108,12 @@ const Configuration& config) const throw (SoftException); + /** + * Checks if a given URL is a userdir + * associated user is assigned to the user parameter + */ + bool checkUserDir(const std::string& url, + UserInfo& user) const; public: /** diff -ur suphp-0.6.1/src/Configuration.cpp suphp-0.6.1-userdir/src/Configuration.cpp --- suphp-0.6.1/src/Configuration.cpp 2005-11-26 14:45:49.000000000 -0500 +++ suphp-0.6.1-userdir/src/Configuration.cpp 2005-12-02 17:22:46.000000000 -0500 @@ -112,6 +112,7 @@ #endif this->umask = 0077; this->chroot_path = ""; + this->handle_userdir = true; } void suPHP::Configuration::readFromFile(File& file) @@ -157,6 +158,8 @@ this->umask = Util::octalStrToInt(value); else if (key == "chroot") this->chroot_path = value; + else if (key == "handle_userdir") + this->handle_userdir = this->strToBool(value); else throw ParsingException("Unknown option \"" + key + "\" in section [global]", @@ -250,3 +253,7 @@ std::string suPHP::Configuration::getChrootPath() const { return this->chroot_path; } + +bool suPHP::Configuration::getHandleUserdir() const { + return this->handle_userdir; +} diff -ur suphp-0.6.1/src/Configuration.hpp suphp-0.6.1-userdir/src/Configuration.hpp --- suphp-0.6.1/src/Configuration.hpp 2005-11-26 14:45:49.000000000 -0500 +++ suphp-0.6.1-userdir/src/Configuration.hpp 2005-12-02 15:07:41.000000000 -0500 @@ -57,7 +57,8 @@ int min_gid; int umask; std::string chroot_path; - + bool handle_userdir; + /** * Converts string to bool */ @@ -165,6 +166,12 @@ * Return chroot path */ std::string getChrootPath() const; + + /** + * Return whether to correctly handle mod_userdir sites + */ + bool getHandleUserdir() const; + }; }; diff -ur suphp-0.6.1/src/apache/mod_suphp.c suphp-0.6.1-userdir/src/apache/mod_suphp.c --- suphp-0.6.1/src/apache/mod_suphp.c 2005-11-26 14:45:49.000000000 -0500 +++ suphp-0.6.1-userdir/src/apache/mod_suphp.c 2005-12-02 15:07:41.000000000 -0500 @@ -444,7 +444,10 @@ } } } - + + /* for mod_userdir checking */ + apr_table_setn(r->subprocess_env, "SUPHP_URI", apr_pstrdup(p, r->uri)); + if (auth_user && auth_pass) { ap_table_setn(r->subprocess_env, "SUPHP_AUTH_USER", auth_user); ap_table_setn(r->subprocess_env, "SUPHP_AUTH_PW", auth_pass); diff -ur suphp-0.6.1/src/apache2/mod_suphp.c suphp-0.6.1-userdir/src/apache2/mod_suphp.c --- suphp-0.6.1/src/apache2/mod_suphp.c 2005-11-26 14:45:49.000000000 -0500 +++ suphp-0.6.1-userdir/src/apache2/mod_suphp.c 2005-12-02 15:07:41.000000000 -0500 @@ -461,6 +461,10 @@ } } + /* for mod_userdir checking */ + apr_table_setn(r->subprocess_env, "SUPHP_URI", + apr_pstrdup(r->pool, r->uri)); + if (auth_user && auth_pass) { apr_table_setn(r->subprocess_env, "SUPHP_AUTH_USER", auth_user); --- NEW FILE mod_suphp.conf --- # This is the Apache server configuration file providing suPHP support.. # It contains the configuration directives to instruct the server how to # serve php pages while switching to the user context before rendering. # For directives see LoadModule suphp_module modules/mod_suphp.so # Define PHP Types AddType application/x-httpd-php .php # To use suPHP to parse PHP-Files ### Uncomment to activate mod_suphp #AddHandler x-httpd-php .php # This option tells mod_suphp if a PHP-script requested on this server (or # VirtualHost) should be run with the PHP-interpreter or returned to the # browser "as it is". suPHP_Engine on suPHP_AddHandler x-httpd-php # This option tells mod_suphp which path to pass on to the PHP-interpreter # (by setting the PHPRC environment variable). # Do *NOT* refer to a file but to the directory the file resists in. # # E.g.: If you want to use "/path/to/server/config/php.ini", use "suPHP_Config # /path/to/server/config". # # If you don't use this option, PHP will use its compiled in default path. #suPHP_ConfigPath /etc Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Feb 2006 16:36:27 -0000 1.3 +++ sources 6 Feb 2006 16:40:00 -0000 1.4 @@ -1,6 +1 @@ 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz -4d95b68cc54bc401ec5b4005baf0ad51 README.fedora -5252fb24e364451c1ffb0d3e112a61ba mod_suphp-0.6.1-userdir.patch -33939dd30a5271a7d9daeb2b362dd11e mod_suphp-0.6.1-AddHandler.patch -b7cbd9c5cea2249625018629b86a2a11 suphp.conf -2c4c073c47ba34ef72293bdaff693a98 mod_suphp.conf From fedora-extras-commits at redhat.com Mon Feb 6 16:43:24 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 11:43:24 -0500 Subject: rpms/mod_suphp/devel mod_suphp-0.6.1-AddHandler.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 Message-ID: <200602061643.k16GhvSd018646@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18626 Modified Files: .cvsignore Added Files: mod_suphp-0.6.1-AddHandler.patch Log Message: * Mon Feb 06 2006 Andreas Thienemann 0.6.1-1 - Updated to 0.6.1 mod_suphp-0.6.1-AddHandler.patch: --- NEW FILE mod_suphp-0.6.1-AddHandler.patch --- --- suphp-0.6.1/src/apache2/mod_suphp.c.orig 2006-02-06 16:08:30.591794312 +0100 +++ suphp-0.6.1/src/apache2/mod_suphp.c 2006-02-06 16:08:36.532891128 +0100 @@ -313,8 +313,8 @@ AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF, "User and group scripts shall be run as"), #endif - AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"), - AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"), + AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"), + AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"), {NULL} }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Feb 2006 16:36:27 -0000 1.3 +++ .cvsignore 6 Feb 2006 16:43:24 -0000 1.4 @@ -1,6 +1 @@ suphp-0.6.1.tar.gz -README.fedora -mod_suphp-0.6.1-userdir.patch -mod_suphp-0.6.1-AddHandler.patch -suphp.conf -mod_suphp.conf From fedora-extras-commits at redhat.com Mon Feb 6 17:04:51 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 12:04:51 -0500 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.7,1.8 Message-ID: <200602061705.k16H5OHa020511@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20490 Modified Files: mod_suphp.spec Log Message: Missing BuildRequire for apr added Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_suphp.spec 6 Feb 2006 16:36:27 -0000 1.7 +++ mod_suphp.spec 6 Feb 2006 17:04:51 -0000 1.8 @@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) -BuildRequires: httpd-devel >= 2.0 +BuildRequires: httpd-devel >= 2.0, apr-devel %description suPHP is an apache module for executing PHP scripts with the permissions of From fedora-extras-commits at redhat.com Mon Feb 6 17:06:50 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 12:06:50 -0500 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.8,1.9 Message-ID: <200602061707.k16H7Nrg020538@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20521 Modified Files: mod_suphp.spec Log Message: Fixed %configure for rawhide Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mod_suphp.spec 6 Feb 2006 17:04:51 -0000 1.8 +++ mod_suphp.spec 6 Feb 2006 17:06:50 -0000 1.9 @@ -42,8 +42,6 @@ %build echo "Building mod_suphp with %{php} as PHP interpreter" %configure \ - --with-apxs=/usr/sbin/apxs \ - --with-apr=/usr/bin/apr-config \ --with-apache-user=apache \ --with-min-uid=500 \ --with-min-gid=500 \ From fedora-extras-commits at redhat.com Mon Feb 6 17:25:18 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 6 Feb 2006 12:25:18 -0500 Subject: fedora-security/audit fc4,1.145,1.146 Message-ID: <200602061725.k16HPIDL020729@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20711 Modified Files: fc4 Log Message: Note the unzip update. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- fc4 3 Feb 2006 19:54:01 -0000 1.145 +++ fc4 6 Feb 2006 17:25:10 -0000 1.146 @@ -57,7 +57,7 @@ CVE-2005-4685 VULNERABLE (mozilla) CVE-2005-4685 VULNERABLE (firefox) CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream -CVE-2005-4667 VULNERABLE (unzip) bz#178961 +CVE-2005-4667 backport (unzip) [since FEDORA-2006-098] bz#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 From fedora-extras-commits at redhat.com Mon Feb 6 17:25:53 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Feb 2006 12:25:53 -0500 Subject: rpms/perl-GDGraph/FC-4 .cvsignore, 1.3, 1.4 perl-GDGraph.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200602061726.k16HQQnF020788@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-serv20745/FC-4 Modified Files: .cvsignore perl-GDGraph.spec sources Log Message: Update to 1.4306. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2005 18:31:37 -0000 1.3 +++ .cvsignore 6 Feb 2006 17:25:51 -0000 1.4 @@ -1 +1 @@ -GDGraph-1.4305.tar.gz +GDGraph-1.4306.tar.gz Index: perl-GDGraph.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/perl-GDGraph.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-GDGraph.spec 22 Dec 2005 18:31:37 -0000 1.6 +++ perl-GDGraph.spec 6 Feb 2006 17:25:52 -0000 1.7 @@ -1,5 +1,5 @@ Name: perl-GDGraph -Version: 1.4305 +Version: 1.4306 Release: 1%{?dist} Summary: Graph generation package for Perl @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(GD), perl(GD::Text) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -55,6 +55,9 @@ %changelog +* Mon Feb 6 2006 Jose Pedro Oliveira - 1.4306-1 +- Update to 1.4306. + * Thu Dec 22 2005 Jose Pedro Oliveira - 1.4305-1 - Update to 1.4305. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2005 18:31:37 -0000 1.3 +++ sources 6 Feb 2006 17:25:52 -0000 1.4 @@ -1 +1 @@ -7cba9e4e9fc0c146ab1e34d00f61d932 GDGraph-1.4305.tar.gz +3f2b2d96690782e0ae86f068a22e0331 GDGraph-1.4306.tar.gz From fedora-extras-commits at redhat.com Mon Feb 6 17:26:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Feb 2006 12:26:07 -0500 Subject: rpms/perl-GDGraph/devel .cvsignore, 1.3, 1.4 perl-GDGraph.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200602061726.k16HQe5G020793@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GDGraph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20745/devel Modified Files: .cvsignore perl-GDGraph.spec sources Log Message: Update to 1.4306. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2005 16:02:32 -0000 1.3 +++ .cvsignore 6 Feb 2006 17:26:07 -0000 1.4 @@ -1 +1 @@ -GDGraph-1.4305.tar.gz +GDGraph-1.4306.tar.gz Index: perl-GDGraph.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/perl-GDGraph.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-GDGraph.spec 22 Dec 2005 16:02:32 -0000 1.6 +++ perl-GDGraph.spec 6 Feb 2006 17:26:07 -0000 1.7 @@ -1,5 +1,5 @@ Name: perl-GDGraph -Version: 1.4305 +Version: 1.4306 Release: 1%{?dist} Summary: Graph generation package for Perl @@ -12,7 +12,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(GD), perl(GD::Text) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -55,6 +55,9 @@ %changelog +* Mon Feb 6 2006 Jose Pedro Oliveira - 1.4306-1 +- Update to 1.4306. + * Thu Dec 22 2005 Jose Pedro Oliveira - 1.4305-1 - Update to 1.4305. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2005 16:02:32 -0000 1.3 +++ sources 6 Feb 2006 17:26:07 -0000 1.4 @@ -1 +1 @@ -7cba9e4e9fc0c146ab1e34d00f61d932 GDGraph-1.4305.tar.gz +3f2b2d96690782e0ae86f068a22e0331 GDGraph-1.4306.tar.gz From fedora-extras-commits at redhat.com Mon Feb 6 17:28:53 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Feb 2006 12:28:53 -0500 Subject: rpms/xpilot-ng - New directory Message-ID: <200602061728.k16HStxf020941@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20933/xpilot-ng Log Message: Directory /cvs/extras/rpms/xpilot-ng added to the repository From fedora-extras-commits at redhat.com Mon Feb 6 17:28:59 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Feb 2006 12:28:59 -0500 Subject: rpms/xpilot-ng/devel - New directory Message-ID: <200602061729.k16HT1k0020956@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20933/xpilot-ng/devel Log Message: Directory /cvs/extras/rpms/xpilot-ng/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 6 17:29:12 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Feb 2006 12:29:12 -0500 Subject: rpms/xpilot-ng Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602061729.k16HTETF020990@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20978 Added Files: Makefile import.log Log Message: Setup of module xpilot-ng --- NEW FILE Makefile --- # Top level Makefile for module xpilot-ng all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Feb 6 17:29:18 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Feb 2006 12:29:18 -0500 Subject: rpms/xpilot-ng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602061729.k16HTKmf021010@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20978/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xpilot-ng --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Feb 6 17:30:53 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Feb 2006 12:30:53 -0500 Subject: rpms/xpilot-ng import.log,1.1,1.2 Message-ID: <200602061731.k16HVP6e021146@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21084 Modified Files: import.log Log Message: auto-import xpilot-ng-4.7.2-4 on branch devel from xpilot-ng-4.7.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Feb 2006 17:29:12 -0000 1.1 +++ import.log 6 Feb 2006 17:30:52 -0000 1.2 @@ -0,0 +1 @@ +xpilot-ng-4_7_2-4:HEAD:xpilot-ng-4.7.2-4.src.rpm:1139247049 From fedora-extras-commits at redhat.com Mon Feb 6 17:30:58 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Feb 2006 12:30:58 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng-sdl.desktop, NONE, 1.1 xpilot-ng-x11.desktop, NONE, 1.1 xpilot-ng.png, NONE, 1.1 xpilot-ng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602061731.k16HVVED021152@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21084/devel Modified Files: .cvsignore sources Added Files: xpilot-ng-sdl.desktop xpilot-ng-x11.desktop xpilot-ng.png xpilot-ng.spec Log Message: auto-import xpilot-ng-4.7.2-4 on branch devel from xpilot-ng-4.7.2-4.src.rpm --- NEW FILE xpilot-ng-sdl.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XPilot-ng GenericName=XPilot-ng Comment=XPilot client Exec=xpilot-ng-sdl Icon=xpilot-ng.png Terminal=false Type=Application Categories=Application;Game Version=4.7.2 --- NEW FILE xpilot-ng-x11.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XPilot-ng classic GenericName=XPilot-ng classic Comment=XPilot client with old-school graphics Exec=xpilot-ng-x11 Icon=xpilot-ng.png Terminal=false Type=Application Categories=Application;Game Version=4.7.2 --- NEW FILE xpilot-ng.spec --- Name: xpilot-ng Version: 4.7.2 Release: 4%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games License: GPL URL: http://xpilot.sourceforge.net Source0: http://dl.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz Source1: xpilot-ng.png Source2: xpilot-ng-x11.desktop Source3: xpilot-ng-sdl.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel # The following BR are not needed for FC-4 BuildRequires: libXt-devel mesa-libGLU-devel libXxf86misc-devel %description A highly addictive, infinitely configurable multiplayer space arcade game. You pilot a spaceship around space, dodging obstacles, shooting players and bots, collecting power-ups, and causing general mayhem. %package server Summary: Server for hosting xpilot games Group: Amusements/Games %description server The xpilot server. This allows you to host xpilot games on your computer and develop new xpilot maps. This is required if you are playing alone, but not required if you are joining one of the public xpilot games hosted on the internet. %prep %setup -q pushd doc/man iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-server.man > xpilot-ng-server.man.new mv xpilot-ng-server.man.new xpilot-ng-server.man iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-x11.man > xpilot-ng-x11.man.new mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT chmod a+x $RPM_BUILD_ROOT/%{_datadir}/%{name}/mapconvert.py desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE3} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ %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,-) %{_bindir}/xpilot-ng-replay %{_bindir}/xpilot-ng-sdl %{_bindir}/xpilot-ng-x11 %dir %{_datadir}/%{name} %{_datadir}/%{name}/textures %{_datadir}/%{name}/fonts %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/apps/*.png %{_mandir}/man6/xpilot-ng-replay.6.gz %{_mandir}/man6/xpilot-ng-sdl.6.gz %{_mandir}/man6/xpilot-ng-x11.6.gz %doc README COPYING %files server %defattr(-,root,root,-) %{_bindir}/xpilot-ng-xp-mapedit %{_bindir}/xpilot-ng-server %dir %{_datadir}/%{name} %{_datadir}/%{name}/defaults.txt %{_datadir}/%{name}/password.txt %{_datadir}/%{name}/robots.txt %{_datadir}/%{name}/shipshapes.txt %{_datadir}/%{name}/mapconvert.py %{_datadir}/%{name}/maps %{_mandir}/man6/xpilot-ng-server.6.gz %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz %doc README COPYING #The following two entries need to be removed with FC-4 %ghost %{_datadir}/%{name}/mapconvert.pyc %ghost %{_datadir}/%{name}/mapconvert.pyo %changelog * Mon Feb 6 2006 Wart 4.7.2-5 - Don't make duplicates of the doc files for the subpackage. - Use version macro is source path - Preserve timestamps when installing icons. * Fri Feb 3 2006 Wart 4.7.2-3 - Add readme and license files to the server subpackage - Set default file attributes for the server subpackage * Fri Feb 3 2006 Wart 4.7.2-2 - Allow both packages to 0wn datadir/xpilot-ng - Clean up non-utf8 man pages * Thu Feb 2 2006 Wart 4.7.2-1 - Initial submission to Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Feb 2006 17:29:17 -0000 1.1 +++ .cvsignore 6 Feb 2006 17:30:58 -0000 1.2 @@ -0,0 +1 @@ +xpilot-ng-4.7.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Feb 2006 17:29:17 -0000 1.1 +++ sources 6 Feb 2006 17:30:58 -0000 1.2 @@ -0,0 +1 @@ +b922251ab9c69f87567c9606304ee589 xpilot-ng-4.7.2.tar.gz From fedora-extras-commits at redhat.com Mon Feb 6 17:31:09 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Mon, 6 Feb 2006 12:31:09 -0500 Subject: rpms/mediawiki/devel mediawiki.spec,1.1,1.2 Message-ID: <200602061731.k16HVfX3021181@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21118 Modified Files: mediawiki.spec Log Message: * Mon Feb 06 2006 Roozbeh Pournader - 1.5.6-5 - Put internal doc files in the right directory, renaming it back to docs (#180177) Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mediawiki.spec 5 Feb 2006 09:00:43 -0000 1.1 +++ mediawiki.spec 6 Feb 2006 17:31:08 -0000 1.2 @@ -2,7 +2,7 @@ Name: mediawiki Version: 1.5.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The PHP-based wiki software behind Wikipedia Group: Applications/Internet @@ -59,9 +59,6 @@ cp -pr maintenance skins [[:lower:]]*.* $RPM_BUILD_ROOT%{wikidir} %{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl -install -d $RPM_BUILD_ROOT%{_defaultdocdir}/internals -cp -pr docs/* $RPM_BUILD_ROOT%{_defaultdocdir}/internals - install -d $RPM_BUILD_ROOT%{wikidir}/math install math/texvc $RPM_BUILD_ROOT%{wikidir}/math install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf @@ -74,12 +71,12 @@ %defattr(-,root,root,-) %doc COPYING FAQ HISTORY README RELEASE-NOTES UPGRADE %doc INSTALL.fedora -%doc %{_defaultdocdir}/internals +%doc docs %config(noreplace) %{_sysconfdir}/httpd/conf.d/mediawiki.conf %dir %{wikidir} -%{wikidir}/[^c]*[^h] +%{wikidir}/[^cd]*[^h] %attr(770,root,apache) %dir %{wikidir}/config %{wikidir}/config/index.php @@ -92,6 +89,10 @@ %changelog +* Mon Feb 06 2006 Roozbeh Pournader - 1.5.6-5 +- Put internal doc files in the right directory, renaming it + back to docs (#180177) + * Sat Feb 04 2006 Roozbeh Pournader - 1.5.6-4 - Use Requires(pre) instead of PreReq (Mike McGrath) From fedora-extras-commits at redhat.com Mon Feb 6 17:48:37 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Feb 2006 12:48:37 -0500 Subject: owners owners.list,1.614,1.615 Message-ID: <200602061749.k16Hn93x021326@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21307 Modified Files: owners.list Log Message: Added xpilot-ng Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.614 retrieving revision 1.615 diff -u -r1.614 -r1.615 --- owners.list 6 Feb 2006 13:58:22 -0000 1.614 +++ owners.list 6 Feb 2006 17:48:36 -0000 1.615 @@ -1421,6 +1421,7 @@ Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xosd|On-screen display library for X|jcarpenter at condell.org|extras-qa at fedoraproject.org| +Fedora Extras|xpilot-ng|Space arcade game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xscorch|A Scorched Earth clone|mgarski at post.pl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Feb 6 19:34:22 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Mon, 6 Feb 2006 14:34:22 -0500 Subject: rpms/revelation/devel .cvsignore, 1.8, 1.9 revelation.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <200602061934.k16JYtjY026111@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/revelation/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26040 Modified Files: .cvsignore revelation.spec sources Log Message: update to 0.4.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/revelation/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Aug 2005 18:15:31 -0000 1.8 +++ .cvsignore 6 Feb 2006 19:34:22 -0000 1.9 @@ -1,2 +1 @@ -revelation-0.4.5.tar.bz2 -revelation-dont_check_everything.patch +revelation-0.4.7.tar.bz2 Index: revelation.spec =================================================================== RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- revelation.spec 14 Oct 2005 16:12:50 -0000 1.14 +++ revelation.spec 6 Feb 2006 19:34:22 -0000 1.15 @@ -3,13 +3,11 @@ Summary: Password manager for GNOME 2 Name: revelation -Version: 0.4.5 -Release: 3%{?dist} +Version: 0.4.7 +Release: 1%{?dist} License: GPL Group: Applications/Productivity -Source0: ftp://oss.codepoet.no/revelation/revelation-0.4.5.tar.bz2 -# the reason for this patch is found in http://oss.codepoet.no/pipermail/revelation-list/2005-August/000132.html -Patch0: %{name}-dont_check_everything.patch +Source0: ftp://oss.codepoet.no/revelation/revelation-0.4.7.tar.bz2 URL: http://oss.codepoet.no/revelation/ Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-crypto >= 2.0 @@ -40,7 +38,6 @@ %prep %setup -q -%patch0 -p0 -b .patch0 %build %configure --disable-desktop-update --disable-mime-update --with-cracklib-dict=/usr/share/cracklib/pw_dict @@ -109,6 +106,9 @@ %{_libexecdir}/revelation-applet %changelog +* Mon Feb 06 2006 Thorsten Leemhuis 0.4.7-1 +- update to 0.4.7 + * Fri Oct 14 2005 Thorsten Leemhuis 0.4.5-3 - use cracklib-dicts correctly (#170742) - don't ship revelation dicts Index: sources =================================================================== RCS file: /cvs/extras/rpms/revelation/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Aug 2005 18:15:31 -0000 1.8 +++ sources 6 Feb 2006 19:34:22 -0000 1.9 @@ -1,2 +1 @@ -f509367e8b5ab869fe00c6c3f87d2b58 revelation-0.4.5.tar.bz2 -b99ea591311a237d50e16384ab31d6ee revelation-dont_check_everything.patch +d0a100914b0ffc0a09b1d4067f4307eb revelation-0.4.7.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 6 19:39:37 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Mon, 6 Feb 2006 14:39:37 -0500 Subject: rpms/wxGTK/devel wxGTK-2.6.2-gcc41stringh.patch, NONE, 1.1 wxGTK-2.6.2-socketclosefix.patch, NONE, 1.1 wxGTK.spec, 1.15, 1.16 Message-ID: <200602061940.k16JeA8S026705@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26536 Modified Files: wxGTK.spec Added Files: wxGTK-2.6.2-gcc41stringh.patch wxGTK-2.6.2-socketclosefix.patch Log Message: fix bug #178184 (amule crashes), and also make build with gcc 4.1. wxGTK-2.6.2-gcc41stringh.patch: --- NEW FILE wxGTK-2.6.2-gcc41stringh.patch --- =================================================================== RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/string.h,v retrieving revision 1.206.2.2 retrieving revision 1.206.2.3 diff -u -r1.206.2.2 -r1.206.2.3 --- wxWidgets/include/wx/string.h 2005/11/01 13:32:48 1.206.2.2 +++ wxWidgets/include/wx/string.h 2005/12/15 19:26:27 1.206.2.3 @@ -1291,16 +1291,15 @@ { return (wxString&)wxStringBase::operator+=(ch); } }; -// IBM xlC compiler needs these operators to be declared in global scope, -// although this shouldn't be a problem for the other compilers we prefer to -// only do it for it in stable 2.6 branch -#ifdef __IBMCPP__ +// notice that even though for many compilers the friend declarations above are +// enough, from the point of view of C++ standard we must have the declarations +// here as friend ones are not injected in the enclosing namespace and without +// them the code fails to compile with conforming compilers such as xlC or g++4 wxString WXDLLIMPEXP_BASE operator+(const wxString& string1, const wxString& string2); wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxChar ch); wxString WXDLLIMPEXP_BASE operator+(wxChar ch, const wxString& string); wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const wxChar *psz); wxString WXDLLIMPEXP_BASE operator+(const wxChar *psz, const wxString& string); -#endif // __IBMCPP__ // define wxArrayString, for compatibility #if WXWIN_COMPATIBILITY_2_4 && !wxUSE_STL wxGTK-2.6.2-socketclosefix.patch: --- NEW FILE wxGTK-2.6.2-socketclosefix.patch --- =================================================================== RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/unix/gsocket.cpp,v retrieving revision 1.51 retrieving revision 1.51.2.1 diff -u -r1.51 -r1.51.2.1 --- wxWidgets/src/unix/gsocket.cpp 2005/09/19 15:18:27 1.51 +++ wxWidgets/src/unix/gsocket.cpp 2005/10/05 15:37:42 1.51.2.1 @@ -8,7 +8,7 @@ * Guillermo Rodriguez Garcia * Purpose: GSocket main Unix and OS/2 file * Licence: The wxWindows licence - * CVSID: $Id: gsocket.cpp,v 1.51 2005/09/19 15:18:27 JS Exp $ + * CVSID: $Id: gsocket.cpp,v 1.51.2.1 2005/10/05 15:37:42 KH Exp $ * ------------------------------------------------------------------------- */ @@ -331,6 +331,9 @@ assert(this); + /* Don't allow events to fire after socket has been closed */ + gs_gui_functions->Disable_Events(this); + /* If socket has been created, shutdown it */ if (m_fd != INVALID_SOCKET) { Index: wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- wxGTK.spec 30 Nov 2005 21:37:34 -0000 1.15 +++ wxGTK.spec 6 Feb 2006 19:39:37 -0000 1.16 @@ -2,7 +2,7 @@ Name: wxGTK Version: 2.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -12,6 +12,8 @@ URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2 Patch0: wxGTK-2.6.2-intl_cpp.patch +Patch1: wxGTK-2.6.2-socketclosefix.patch +Patch2: wxGTK-2.6.2-gcc41stringh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 @@ -72,6 +74,8 @@ %prep %setup -q %patch0 -p0 -b .intlcpp +%patch1 -p1 -b .socketclose +%patch2 -p1 -b .gcc41 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure @@ -168,6 +172,12 @@ %changelog +* Mon Feb 06 2006 Matthew Miller - 2.6.2-4 +- add wxGTK-2.6.2-socketclosefix.patch to fix aMule crashes. see + bugzilla bug #178184 +- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on + FC5 devel w/ gcc-4.1. + * Wed Nov 30 2005 Matthew Miller - 2.6.2-3 - add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other issues (see bug #154618 comment #47) From fedora-extras-commits at redhat.com Mon Feb 6 19:41:19 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Mon, 6 Feb 2006 14:41:19 -0500 Subject: rpms/revelation/FC-4 .cvsignore, 1.7, 1.8 revelation.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200602061941.k16Jfp1g026866@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/revelation/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26795 Modified Files: .cvsignore revelation.spec sources Log Message: update to 0.4.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/revelation/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 Aug 2005 18:31:38 -0000 1.7 +++ .cvsignore 6 Feb 2006 19:41:19 -0000 1.8 @@ -1,2 +1 @@ -revelation-0.4.5.tar.bz2 -revelation-dont_check_everything.patch +revelation-0.4.7.tar.bz2 Index: revelation.spec =================================================================== RCS file: /cvs/extras/rpms/revelation/FC-4/revelation.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- revelation.spec 14 Oct 2005 16:43:52 -0000 1.12 +++ revelation.spec 6 Feb 2006 19:41:19 -0000 1.13 @@ -3,13 +3,11 @@ Summary: Password manager for GNOME 2 Name: revelation -Version: 0.4.5 -Release: 3%{?dist} +Version: 0.4.7 +Release: 1%{?dist} License: GPL Group: Applications/Productivity -Source0: ftp://oss.codepoet.no/revelation/revelation-0.4.5.tar.bz2 -# the reason for this patch is found in http://oss.codepoet.no/pipermail/revelation-list/2005-August/000132.html -Patch0: %{name}-dont_check_everything.patch +Source0: ftp://oss.codepoet.no/revelation/revelation-0.4.7.tar.bz2 URL: http://oss.codepoet.no/revelation/ Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-crypto >= 2.0 @@ -40,7 +38,6 @@ %prep %setup -q -%patch0 -p0 -b .patch0 %build %configure --disable-desktop-update --disable-mime-update --with-cracklib-dict=/usr/share/cracklib/pw_dict @@ -109,6 +106,9 @@ %{_libexecdir}/revelation-applet %changelog +* Mon Feb 06 2006 Thorsten Leemhuis 0.4.7-1 +- update to 0.4.7 + * Fri Oct 14 2005 Thorsten Leemhuis 0.4.5-3 - use cracklib-dicts correctly (#170742) - don't ship revelation dicts Index: sources =================================================================== RCS file: /cvs/extras/rpms/revelation/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 27 Aug 2005 18:31:38 -0000 1.7 +++ sources 6 Feb 2006 19:41:19 -0000 1.8 @@ -1,2 +1 @@ -f509367e8b5ab869fe00c6c3f87d2b58 revelation-0.4.5.tar.bz2 -b99ea591311a237d50e16384ab31d6ee revelation-dont_check_everything.patch +d0a100914b0ffc0a09b1d4067f4307eb revelation-0.4.7.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 6 20:02:18 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 6 Feb 2006 15:02:18 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.1,1.2 Message-ID: <200602062002.k16K2ooE029500@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29483 Modified Files: fetchlog.spec Log Message: * Mon Feb 6 2006 Paul Wouters 1.0-3 - Fixes by Ville Skytt?? to honour $RPM_OPT_FLAGS and run make test Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fetchlog.spec 19 Jan 2006 23:46:04 -0000 1.1 +++ fetchlog.spec 6 Feb 2006 20:02:18 -0000 1.2 @@ -1,10 +1,11 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz +Patch0: %{name}-build.patch Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +17,7 @@ %prep %setup -q +%patch0 %build make %{?_smp_mflags} @@ -27,6 +29,9 @@ install -m755 %{name} %{buildroot}/%{_bindir} install -m644 %{name}.1 %{buildroot}/%{_mandir}/man1 +%check +make test + %clean rm -rf %{buildroot} @@ -37,6 +42,9 @@ %{_mandir}/*/* %changelog +* Mon Feb 6 2006 Paul Wouters 1.0-3 +- Fixes by Ville Skytt?? to honour $RPM_OPT_FLAGS and run make test + * Mon Jan 17 2006 Paul Wouters 1.0-2 - Fixed install target for man page and cleaning before install From fedora-extras-commits at redhat.com Mon Feb 6 20:12:20 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 6 Feb 2006 15:12:20 -0500 Subject: rpms/fetchlog/devel sources,1.2,1.3 Message-ID: <200602062012.k16KCtMf029605@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29585 Modified Files: sources Log Message: added Ville Skytt?? patch to the Makefile to honour $RPM_OPT_FLAGS Index: sources =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jan 2006 23:46:04 -0000 1.2 +++ sources 6 Feb 2006 20:12:20 -0000 1.3 @@ -1 +1 @@ -e2ef0a076d1901c489c953fe48e1b2a9 fetchlog-1.0.tar.gz +99228569b122b994b1ab83148a3bd261 fetchlog-build.patch From fedora-extras-commits at redhat.com Mon Feb 6 21:13:28 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 6 Feb 2006 16:13:28 -0500 Subject: rpms/blender/FC-4 blender-2.41-alut.patch, NONE, 1.1 blender.spec, 1.16, 1.17 Message-ID: <200602062114.k16LE0qt032427@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32407 Modified Files: blender.spec Added Files: blender-2.41-alut.patch Log Message: Description: Add freealut as dependency. blender-2.41-alut.patch: --- NEW FILE blender-2.41-alut.patch --- --- blender/SConstruct.fa 2006-02-06 22:02:31.000000000 +0100 +++ blender/SConstruct 2006-02-06 22:03:32.000000000 +0100 @@ -146,7 +146,7 @@ gettext_libpath = [] gettext_include = [] # OpenAL library information - openal_lib = ['openal'] + openal_lib = ['openal', 'alut'] openal_libpath = ['/usr/lib'] openal_include = ['/usr/include'] Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- blender.spec 29 Jan 2006 19:59:33 -0000 1.16 +++ blender.spec 6 Feb 2006 21:13:27 -0000 1.17 @@ -1,6 +1,6 @@ Name: blender Version: 2.41 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -13,6 +13,9 @@ Source3: blender.png Source4: blender.desktop Source5: blender.xml + +Patch1: blender-2.41-alut.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -24,7 +27,7 @@ BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: libvorbis-devel -BuildRequires: openal-devel +BuildRequires: freealut-devel BuildRequires: openssl-devel BuildRequires: python-devel BuildRequires: scons @@ -47,6 +50,7 @@ %prep %setup -q -n blender +%patch1 -p1 -b .fa %build sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct @@ -91,8 +95,10 @@ %{_datadir}/blender/ %{_datadir}/mime/packages/blender.xml - %changelog +* Mon Feb 6 2006 Jochen Schmitt 2.41-2 +- Add freealut dependendy. + * Sun Jan 30 2006 Jochen Schmitt 2.41-1 _ Update to new upstream relase. From fedora-extras-commits at redhat.com Mon Feb 6 21:20:03 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 6 Feb 2006 16:20:03 -0500 Subject: rpms/blender/devel blender-2.41-alut.patch, NONE, 1.1 blender.spec, 1.16, 1.17 Message-ID: <200602062120.k16LKZJq032583@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32560 Modified Files: blender.spec Added Files: blender-2.41-alut.patch Log Message: Description: Add freealut as Dependancy. blender-2.41-alut.patch: --- NEW FILE blender-2.41-alut.patch --- --- blender/SConstruct.fa 2006-02-06 22:02:31.000000000 +0100 +++ blender/SConstruct 2006-02-06 22:03:32.000000000 +0100 @@ -146,7 +146,7 @@ gettext_libpath = [] gettext_include = [] # OpenAL library information - openal_lib = ['openal'] + openal_lib = ['openal', 'alut'] openal_libpath = ['/usr/lib'] openal_include = ['/usr/include'] Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- blender.spec 29 Jan 2006 20:42:58 -0000 1.16 +++ blender.spec 6 Feb 2006 21:20:03 -0000 1.17 @@ -1,6 +1,6 @@ Name: blender Version: 2.41 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -13,7 +13,10 @@ Source3: blender.png Source4: blender.desktop Source5: blender.xml -Patch0: blender-2.37-x86_64.patch + +# Patch0: blender-2.37-x86_64.patch +Patch1: blender-2.41-alut.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -25,7 +28,7 @@ BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: libvorbis-devel -BuildRequires: openal-devel +BuildRequires: freealut-devel BuildRequires: openssl-devel BuildRequires: python-devel BuildRequires: scons @@ -53,6 +56,7 @@ %prep %setup -q -n blender # %patch0 -p1 -b .x86_64 +%patch1 -p1 %build sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct @@ -99,6 +103,9 @@ %changelog +* Mon Feb 6 2006 Jochen Schmitt 2.41-2 +- Add freealut as dependancy. + * Sun Jan 30 2006 Jochen Schmitt 2.41-1 - Update to new upstream release. From fedora-extras-commits at redhat.com Mon Feb 6 21:45:37 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 16:45:37 -0500 Subject: rpms/commoncpp2 - New directory Message-ID: <200602062145.k16Ljd4H000465@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/commoncpp2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv457/commoncpp2 Log Message: Directory /cvs/extras/rpms/commoncpp2 added to the repository From fedora-extras-commits at redhat.com Mon Feb 6 21:45:43 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 16:45:43 -0500 Subject: rpms/commoncpp2/devel - New directory Message-ID: <200602062145.k16LjjsQ000480@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/commoncpp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv457/commoncpp2/devel Log Message: Directory /cvs/extras/rpms/commoncpp2/devel added to the repository From fedora-extras-commits at redhat.com Mon Feb 6 21:46:04 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 16:46:04 -0500 Subject: rpms/commoncpp2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200602062146.k16Lk6W3000515@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/commoncpp2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv503 Added Files: Makefile import.log Log Message: Setup of module commoncpp2 --- NEW FILE Makefile --- # Top level Makefile for module commoncpp2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Feb 6 21:46:09 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 16:46:09 -0500 Subject: rpms/commoncpp2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602062146.k16LkBEK000537@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/commoncpp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv503/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module commoncpp2 --- NEW 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 Feb 6 21:47:27 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 16:47:27 -0500 Subject: rpms/commoncpp2 import.log,1.1,1.2 Message-ID: <200602062147.k16Llxg4000621@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/commoncpp2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv584 Modified Files: import.log Log Message: auto-import commoncpp2-1.3.23-1 on branch devel from commoncpp2-1.3.23-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Feb 2006 21:46:04 -0000 1.1 +++ import.log 6 Feb 2006 21:47:26 -0000 1.2 @@ -0,0 +1 @@ +commoncpp2-1_3_23-1:HEAD:commoncpp2-1.3.23-1.src.rpm:1139262407 From fedora-extras-commits at redhat.com Mon Feb 6 21:47:33 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 16:47:33 -0500 Subject: rpms/commoncpp2/devel commoncpp2-ldconfig.patch, NONE, 1.1 commoncpp2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602062148.k16Lm5ZJ000625@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/commoncpp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv584/devel Modified Files: .cvsignore sources Added Files: commoncpp2-ldconfig.patch commoncpp2.spec Log Message: auto-import commoncpp2-1.3.23-1 on branch devel from commoncpp2-1.3.23-1.src.rpm commoncpp2-ldconfig.patch: --- NEW FILE commoncpp2-ldconfig.patch --- --- commoncpp2-1.3.23/Makefile.in.ldconfig 2006-02-03 00:16:30.000000000 +0100 +++ commoncpp2-1.3.23/Makefile.in 2006-02-05 13:27:06.334488968 +0100 @@ -676,23 +676,7 @@ (cd src ; make macosx) install-data-local: - @if test -f /etc/ld.so.conf \ - -a `echo $(libdir) | grep ^/usr`XXX != "XXX" ; then \ - if ! grep -q "$(libdir)" /etc/ld.so.conf; then \ - echo "------------------------------------------------------------------------------" ;\ - echo "Hmm, looks like you forgot to add $(libdir) to /etc/ld.so.conf." ;\ - echo "I'll try to fix it for you (but pay attention to libtool's output" ;\ - echo "next time, ok?)" ;\ - echo "$(libdir)" >> /etc/ld.so.conf && \ - echo "Ok, all fixed." \ - || \ - (echo "" ;\ - echo "Well, that didn't work. Remember to add $(libdir) to" ;\ - echo "/etc/ld.so.conf if you want to use this library.") ;\ - echo "------------------------------------------------------------------------------" ;\ - ldconfig ;\ - fi ;\ - fi + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE commoncpp2.spec --- Summary: GNU Common C++ class framework Name: commoncpp2 Version: 1.3.23 Release: 1%{?dist} License: GPL Group: System Environment/Libraries Source0: http://download.sourceforge.net/gnutelephony/commoncpp2-%{version}.tar.gz Patch0: commoncpp2-ldconfig.patch URL: http://www.gnu.org/software/commoncpp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel, zlib-devel, doxygen %description GNU Common C++ is a portable and highly optimized class framework for writing C++ applications that need to use threads, sockets, XML parsing, serialization, config files, etc. This framework offers a class foundation that hides platform differences from your C++ application so that you need not write platform specific code. GNU Common C++ has been ported to compile natively on most platforms which support posix threads. %package devel Summary: Header files and libraries for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig, libxml2-devel, zlib-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description devel The %{name}-devel package contains the header files and libraries needed to develop programs that use the %{name} library. %prep %setup -q %patch0 -p1 -b .ldconfig %build %configure \ --disable-static \ --disable-dependency-tracking %{__make} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_infodir}/dir find %{buildroot} -name '*.la' -exec rm -f {} \; %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %post -n %{name}-devel /sbin/install-info %{_infodir}/commoncpp2.info %{_infodir}/dir || : %preun -n %{name}-devel if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/commoncpp2.info %{_infodir}/dir || : fi %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING README ChangeLog %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %dir %{_includedir}/cc++2 %{_includedir}/cc++2/* %{_bindir}/ccgnu2-config %{_libdir}/*.so %{_libdir}/pkgconfig/libccext2.pc %{_libdir}/pkgconfig/libccgnu2.pc %{_datadir}/aclocal/ost_check2.m4 %{_infodir}/commoncpp2.info* %changelog * Sun Feb 05 2006 Andreas Thienemann 1.3.23-1 - Incorporated suggestions for extras * Fri Feb 03 2006 Andreas Thienemann 1.3.22-1 - Initial spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Feb 2006 21:46:09 -0000 1.1 +++ .cvsignore 6 Feb 2006 21:47:33 -0000 1.2 @@ -0,0 +1 @@ +commoncpp2-1.3.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Feb 2006 21:46:09 -0000 1.1 +++ sources 6 Feb 2006 21:47:33 -0000 1.2 @@ -0,0 +1 @@ +7cf53157929876054cff3234f6ffaae7 commoncpp2-1.3.23.tar.gz From fedora-extras-commits at redhat.com Mon Feb 6 21:51:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 16:51:55 -0500 Subject: owners owners.list,1.615,1.616 Message-ID: <200602062152.k16LqRL0000691@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv674 Modified Files: owners.list Log Message: Added commoncpp2 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.615 retrieving revision 1.616 diff -u -r1.615 -r1.616 --- owners.list 6 Feb 2006 17:48:36 -0000 1.615 +++ owners.list 6 Feb 2006 21:51:54 -0000 1.616 @@ -123,6 +123,7 @@ Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|commoncpp2|GNU Common C++ class framework|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|compat-wxGTK|Compatibility version of the wxWidgets GUI library|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|compat-wxPythonGTK2|Compatibility version of the wxWidgets GUI toolkit for Python|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|compface|Library for handling X-Faces|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Feb 6 22:29:42 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Mon, 6 Feb 2006 17:29:42 -0500 Subject: rpms/balsa/FC-4 .cvsignore, 1.5, 1.6 balsa.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200602062230.k16MUE4D002869@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2848 Modified Files: .cvsignore balsa.spec sources Log Message: - update to upstream version 2.3.10. Enable gtkspell. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Dec 2005 12:56:28 -0000 1.5 +++ .cvsignore 6 Feb 2006 22:29:41 -0000 1.6 @@ -1,2 +1,2 @@ gmime-2.1.17.tar.bz2 -balsa-2.3.7.tar.bz2 +balsa-2.3.10.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/FC-4/balsa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- balsa.spec 4 Dec 2005 13:01:36 -0000 1.7 +++ balsa.spec 6 Feb 2006 22:29:41 -0000 1.8 @@ -1,10 +1,10 @@ %define gmimever 2.1.17 -%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings --with-ssl --with-gss +%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell Name: balsa -Version: 2.3.7 -Release: 2%{?dist} -Summary: Balsa Mail Client +Version: 2.3.10 +Release: 1%{?dist} +Summary: Mail Client Group: Applications/Internet License: GPL @@ -16,23 +16,30 @@ Requires: libesmtp >= 1.0.3 Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: scrollkeeper -BuildRequires: libesmtp-devel >= 1.0.3 + BuildRequires: aspell-devel -BuildRequires: openssl-devel +BuildRequires: desktop-file-utils +BuildRequires: gnome-vfs2-devel +BuildRequires: gtk2-devel +BuildRequires: gtkhtml2-devel +BuildRequires: gtkspell-devel -BuildRequires: gtk2-devel >= 2.0.0 -BuildRequires: libgnome-devel >= 2.0.0 -BuildRequires: libgnomeui-devel >= 2.0.0 -BuildRequires: gnome-vfs2-devel >= 2.0.0 -BuildRequires: libgnomeprint22-devel >= 2.2.0 -BuildRequires: libgnomeprintui22-devel >= 2.2.0 -BuildRequires: desktop-file-utils +BuildRequires: libesmtp-devel >= 1.0.3 +BuildRequires: libgnome-devel +BuildRequires: libgnomeprint22-devel +BuildRequires: libgnomeprintui22-devel +BuildRequires: libgnomeui-devel +BuildRequires: openssl-devel +BuildRequires: scrollkeeper %description -Balsa is an e-mail reader. This client is part of the GNOME -desktop environment. It supports local mailboxes, POP3 and -IMAP. +Balsa is a GNOME email client which supports mbox, maildir, and mh +local mailboxes, and IMAP4 and POP3 remote mailboxes. Email can be +sent via sendmail or SMTP. Optional multithreading support allows for +non-intrusive retrieval and sending of mail. A finished GUI similar to +that of the Eudora email client supports viewing images inline, saving +message parts, viewing headers, adding attachments, moving messages, +and printing messages. %prep %setup -q -D -a 1 @@ -50,7 +57,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" -rm -f "$RPM_BUILD_ROOT%{_bindir}"/balsa-ab desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/balsa.desktop \ --vendor=fedora \ @@ -85,21 +91,24 @@ %doc README COPYING ChangeLog NEWS TODO AUTHORS HACKING docs/mh-mail-HOWTO %doc docs/vconvert.awk docs/pine2vcard %{_bindir}/balsa +%{_bindir}/balsa-ab %{_libdir}/bonobo/servers/GNOME_Balsa.server %{_datadir}/applications/*.desktop -%{_datadir}/balsa/hicolor/* -%{_datadir}/balsa/pixmaps/* -%{_datadir}/gnome/help/balsa/* +%{_datadir}/balsa/ +%{_datadir}/gnome/help/balsa/ %{_datadir}/icons/hicolor/* %{_datadir}/idl/Balsa.idl -%{_datadir}/omf/balsa/* +%{_datadir}/omf/balsa/ %{_datadir}/pixmaps/gnome-balsa2.png -%{_datadir}/sounds/balsa/* +%{_datadir}/sounds/balsa/ %{_mandir}/man1/balsa.1* %config(noreplace) %{_sysconfdir}/sound/events/balsa.soundlist %changelog +* Mon Feb 6 2006 Pawel Salek - 2.3.10-1 +- update to upstream version 2.3.10. Enable gtkspell. + * Sun Dec 4 2005 Pawel Salek - 2.3.7-1 - update to upstream version 2.3.7. Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Dec 2005 12:56:28 -0000 1.5 +++ sources 6 Feb 2006 22:29:41 -0000 1.6 @@ -1,2 +1,2 @@ 4be55ee55e4b3966bd51fadbf5fb323b gmime-2.1.17.tar.bz2 -d50a439a8b8c2be99e3b0108d5d6073e balsa-2.3.7.tar.bz2 +55900922195886be867cd5060548ff7f balsa-2.3.10.tar.bz2 From fedora-extras-commits at redhat.com Mon Feb 6 22:54:02 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Feb 2006 17:54:02 -0500 Subject: rpms/gnomebaker/FC-4 gnomebaker.spec,1.2,1.3 Message-ID: <200602062254.k16MsYTk003866@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3801 Modified Files: gnomebaker.spec Log Message: FC4 changes Index: gnomebaker.spec =================================================================== RCS file: /cvs/extras/rpms/gnomebaker/FC-4/gnomebaker.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnomebaker.spec 6 Feb 2006 14:02:12 -0000 1.2 +++ gnomebaker.spec 6 Feb 2006 22:54:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: gnomebaker Version: 0.5.1 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Gnome CD/DVD burner Group: Applications/Multimedia @@ -11,7 +11,7 @@ BuildRequires: libgnomeui-devel >= 2.10.0 BuildRequires: libglade2-devel -BuildRequires: gstreamer08-devel +BuildRequires: gstreamer-devel BuildRequires: gettext BuildRequires: scrollkeeper BuildRequires: desktop-file-utils @@ -76,12 +76,8 @@ %changelog -* Mon Feb 6 2006 Brian Pepple - 0.5.1-2 -- Bump release. - * Sat Feb 4 2006 Brian Pepple - 0.5.1-1 - Drop aclocal & autoconf calls. -- Change gstreamer-devel to gstreamer08-devel for FC5. - Add dist tag. - Correct permissions on AUTHORS & TODO. - Drop help & desktop patchs. From fedora-extras-commits at redhat.com Mon Feb 6 23:25:08 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 6 Feb 2006 18:25:08 -0500 Subject: rpms/fetchlog/devel .cvsignore,1.2,1.3 Message-ID: <200602062325.k16NPedc006847@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6823 Modified Files: .cvsignore Log Message: .cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jan 2006 23:46:04 -0000 1.2 +++ .cvsignore 6 Feb 2006 23:25:07 -0000 1.3 @@ -1 +1 @@ -fetchlog-1.0.tar.gz +fetchlog-build.patch From fedora-extras-commits at redhat.com Mon Feb 6 23:36:19 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 6 Feb 2006 18:36:19 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.2,1.3 Message-ID: <200602062336.k16Napg1007190@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7161 Modified Files: fetchlog.spec Log Message: * Mon Feb 6 2006 Paul Wouters 1.0-3 - Bump version due to make tag error Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fetchlog.spec 6 Feb 2006 20:02:18 -0000 1.2 +++ fetchlog.spec 6 Feb 2006 23:36:19 -0000 1.3 @@ -1,7 +1,7 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz @@ -43,6 +43,9 @@ %changelog * Mon Feb 6 2006 Paul Wouters 1.0-3 +- Bump version due to make tag error + +* Mon Feb 6 2006 Paul Wouters 1.0-3 - Fixes by Ville Skytt?? to honour $RPM_OPT_FLAGS and run make test * Mon Jan 17 2006 Paul Wouters 1.0-2 From fedora-extras-commits at redhat.com Mon Feb 6 23:41:02 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 6 Feb 2006 18:41:02 -0500 Subject: rpms/fetchlog/devel sources,1.3,1.4 Message-ID: <200602062341.k16NfYNN007287@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7266 Modified Files: sources Log Message: sources file went missing? Index: sources =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Feb 2006 20:12:20 -0000 1.3 +++ sources 6 Feb 2006 23:41:01 -0000 1.4 @@ -1 +1 @@ -99228569b122b994b1ab83148a3bd261 fetchlog-build.patch +e2ef0a076d1901c489c953fe48e1b2a9 fetchlog-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Feb 6 23:44:46 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Feb 2006 18:44:46 -0500 Subject: rpms/mod_suphp/devel mod_suphp-0.6.1-apr.patch, NONE, 1.1 mod_suphp.spec, 1.9, 1.10 Message-ID: <200602062345.k16NjIWg007359@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326 Modified Files: mod_suphp.spec Added Files: mod_suphp-0.6.1-apr.patch Log Message: Fixes for newer apr in FC5 mod_suphp-0.6.1-apr.patch: --- NEW FILE mod_suphp-0.6.1-apr.patch --- >From peter.wullinger at gmail.com Sat Jan 7 19:29:36 2006 From: peter.wullinger at gmail.com (Peter Wullinger) Date: Sat Jan 7 19:29:43 2006 Subject: [suPHP] Patches for apr 1.0 (apache 2.2.0) Message-ID: <20060107182936.GA1807 at kaliope.csn.tu-chemnitz.de> Good evening, APR_BRIGAGE_FOREACH() was deprecated in the apr bucket API, so suphp breaks, when using apache >= 2.2.0 and the new apr API. APR_STATUS_IS_SUCCESS() is also gone. The following patch remedies this problem by completely removing all uses of the macros in question alltogether. I have tested these with apache 2.2.0 and apr 1.2.2. NOTE: These patches also add the often ACCESS_CONF support for suPHP_AddHandler and suPHP_RemoveHandler. Remove these lines from the patch, if you don't want them. Cheers, Peter -- --- src/apache2/mod_suphp.c.orig Sat Jan 7 19:03:59 2006 +++ src/apache2/mod_suphp.c Sat Jan 7 19:20:32 2006 @@ -56,7 +56,7 @@ return -1; rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ); - if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0)) + if ((rv != APR_SUCCESS) || (bucket_data_len == 0)) { return 0; } @@ -558,7 +558,9 @@ return rv; } - APR_BRIGADE_FOREACH(bucket, bb) + + bucket = APR_BRIGADE_FIRST(bb); + while (bucket != APR_BRIGADE_SENTINEL(bb)) { const char *data; apr_size_t len; @@ -582,6 +584,8 @@ { child_stopped_reading = 1; } + + bucket = APR_BUCKET_NEXT(bucket); } apr_brigade_cleanup(bb); } @@ -634,12 +638,15 @@ const char *buf; apr_size_t blen; - APR_BRIGADE_FOREACH(b, bb) + b = APR_BRIGADE_FIRST(bb); + while (b != APR_BRIGADE_SENTINEL(bb)) { if (APR_BUCKET_IS_EOS(b)) break; if (apr_bucket_read(b, &buf, &blen, APR_BLOCK_READ) != APR_SUCCESS) break; + + b = APR_BUCKET_NEXT(b); } apr_brigade_destroy(bb); suphp_log_script_err(r, proc->err); @@ -655,12 +662,14 @@ /* empty brigade (script output) */ const char *buf; apr_size_t blen; - APR_BRIGADE_FOREACH(b, bb) + b = APR_BRIGADE_FIRST(bb); + while (b != APR_BRIGADE_SENTINEL(bb)) { if (APR_BUCKET_IS_EOS(b)) break; if (apr_bucket_read(b, &buf, &blen, APR_BLOCK_READ) != APR_SUCCESS) break; + b = APR_BUCKET_NEXT(b); } apr_brigade_destroy(bb); return HTTP_MOVED_TEMPORARILY; -- -- Gl?cklich ist nicht, wer anderen so vorkommt, sondern wer sich selbst daf?r h?lt. -- Lucius Annaeus Seneca Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mod_suphp.spec 6 Feb 2006 17:06:50 -0000 1.9 +++ mod_suphp.spec 6 Feb 2006 23:44:45 -0000 1.10 @@ -1,15 +1,22 @@ # Depending on what version of Fedora we're on, use a different php binary %if 0%{?fedora} - %if "%fedora" >= "4" - %define php /usr/bin/php-cgi - %else - %define php /usr/bin/php - %endif + %if "%{fedora}" >= "5" + %define php /usr/bin/php-cgi + %define apr /usr/bin/apr-1-config + %endif + %if "%{fedora}" == "4" + %define php /usr/bin/php-cgi + %define apr /usr/bin/apr-config + %endif + %if "%{fedora}" <= "3" + %define php /usr/bin/php + %define apr /usr/bin/apr-config + %endif %else %define php /usr/bin/php + %define apr /usr/bin/apr-config %endif - Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.6.1 @@ -22,6 +29,7 @@ Source3: README.fedora Patch0: mod_suphp-0.6.1-userdir.patch Patch1: mod_suphp-0.6.1-AddHandler.patch +Patch2: mod_suphp-0.6.1-apr.patch URL: http://www.suphp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php @@ -39,9 +47,16 @@ %patch0 -p 1 -b .userdir %patch1 -p 1 -b .AddHandler +# Patch source to conform to apr 1.x standards +%if "%{fedora}" >= "5" +%patch2 -p 0 -b .apr +%endif + %build -echo "Building mod_suphp with %{php} as PHP interpreter" +echo "Building mod_suphp with %{php} as PHP interpreter and %{apr} for the apr configuration script." %configure \ + --with-apr=%{apr} \ + --with-apxs=/usr/sbin/apxs \ --with-apache-user=apache \ --with-min-uid=500 \ --with-min-gid=500 \ From fedora-extras-commits at redhat.com Tue Feb 7 01:37:47 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 6 Feb 2006 20:37:47 -0500 Subject: rpms/cacti - New directory Message-ID: <200602070137.k171bnNY011552@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11544/cacti Log Message: Directory /cvs/extras/rpms/cacti added to the repository From fedora-extras-commits at redhat.com Tue Feb 7 01:38:03 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 6 Feb 2006 20:38:03 -0500 Subject: rpms/cacti/devel - New directory Message-ID: <200602070138.k171c5Kf011567@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11544/cacti/devel Log Message: Directory /cvs/extras/rpms/cacti/devel added to the repository From fedora-extras-commits at redhat.com Tue Feb 7 01:41:08 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 6 Feb 2006 20:41:08 -0500 Subject: rpms/cacti/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200602070141.k171fAEP011605@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11593/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cacti --- NEW 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 Feb 7 01:42:50 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 6 Feb 2006 20:42:50 -0500 Subject: rpms/cacti/devel cacti-0.8.6h-dbcfg.patch, NONE, 1.1 cacti-httpd.conf, NONE, 1.1 cacti.README.Fedora, NONE, 1.1 cacti.logrotate, NONE, 1.1 cacti.spec, NONE, 1.1 fix_search_session_clear_issue.patch, NONE, 1.1 fix_sql_syntax_related_to_default_rra_id.patch, NONE, 1.1 mysql_5x_strict.patch, NONE, 1.1 nth_percentile_empty_return_set_issue.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200602070143.k171hMRV011719@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11681/devel Modified Files: .cvsignore sources Added Files: cacti-0.8.6h-dbcfg.patch cacti-httpd.conf cacti.README.Fedora cacti.logrotate cacti.spec fix_search_session_clear_issue.patch fix_sql_syntax_related_to_default_rra_id.patch mysql_5x_strict.patch nth_percentile_empty_return_set_issue.patch Log Message: auto-import cacti-0.8.6h-4 on branch devel from cacti-0.8.6h-4.src.rpm cacti-0.8.6h-dbcfg.patch: --- NEW FILE cacti-0.8.6h-dbcfg.patch --- --- include/config.php.orig 2006-01-13 14:44:09.000000000 -0600 +++ include/config.php 2006-01-13 14:44:23.000000000 -0600 @@ -23,15 +23,7 @@ | - raXnet - http://www.raxnet.net/ | +-------------------------------------------------------------------------+ */ - -/* make sure these values refect your actual database/host/user/password */ -$database_type = "mysql"; -$database_default = "cacti"; -$database_hostname = "localhost"; -$database_username = "cactiuser"; -$database_password = "cactiuser"; -$database_port = "3306"; - +require_once("db.php"); /* ----- you probably do not need to change anything below this line ----- */ /* Files that do not need http header information - Command line scripts */ --- include/db.php.orig 1969-12-31 18:00:00.000000000 -0600 +++ include/db.php 2006-01-13 15:14:07.000000000 -0600 @@ -0,0 +1,9 @@ + --- docs/text/manual.txt.orig 2006-01-13 15:21:40.000000000 -0600 +++ docs/text/manual.txt 2006-01-13 15:22:42.000000000 -0600 @@ -144,7 +144,7 @@ mysql> GRANT ALL ON cacti.* TO cactiuser at localhost IDENTIFIED BY 'somep assword'; mysql> flush privileges; - 5. Edit include/config.php and specify the MySQL user, + 5. Edit /etc/cacti/db.php and specify the MySQL user, password and database for your Cacti configuration. $database_default = "cacti"; $database_hostname = "localhost"; @@ -379,7 +379,7 @@ all the DLL files and sh.exe from the c:\cacti directory. Configure Cacti - 1. Edit cacti_web_root/cacti/include/config.php and specify + 1. Edit cacti_web_root/cacti/include/db.php and specify the MySQL user, password, database, and database port for your Cacti configuration. $database_default = "cacti"; @@ -504,7 +504,7 @@ shell> tar xzvf cacti-version.tar.gz 4. Rename the new Cacti directory to match the old one. shell> mv cacti-version cacti - 5. Edit include/config.php and specify the MySQL user, + 5. Edit /etc/cacti/db.php and specify the MySQL user, password and database for your Cacti configuration. $database_default = "cacti"; $database_hostname = "localhost"; --- ./docs/UPGRADE.orig 2006-01-13 15:32:34.000000000 -0600 +++ ./docs/UPGRADE 2006-01-13 15:35:37.000000000 -0600 @@ -21,7 +21,7 @@ shell> mv cacti-version cacti - 5. Edit include/config.php and specify the MySQL user, password and + 5. Edit /etc/cacti/db.php and specify the MySQL user, password and database for your Cacti configuration. $database_default = "cacti"; --- ./docs/INSTALL.orig 2006-01-13 15:32:45.000000000 -0600 +++ ./docs/INSTALL 2006-01-13 15:35:46.000000000 -0600 @@ -19,7 +19,7 @@ mysql> GRANT ALL ON cacti.* TO cactiuser at localhost IDENTIFIED BY 'somepassword'; mysql> flush privileges; - 5. Edit include/config.php and specify the MySQL user, password and + 5. Edit /etc/cacti/db.php and specify the MySQL user, password and database for your Cacti configuration. $database_default = "cacti"; --- ./docs/html/upgrade.html.orig 2006-01-13 15:32:22.000000000 -0600 +++ ./docs/html/upgrade.html 2006-01-13 15:35:18.000000000 -0600 @@ -67,7 +67,7 @@
  • -

    Edit include/config.php and specify the MySQL user, password and database for your Cacti configuration.

    +

    Edit /etc/cacti/db.php and specify the MySQL user, password and database for your Cacti configuration.

     $database_default = "cacti";
 $database_hostname = "localhost";
--- ./docs/html/install_unix.html.orig	2006-01-13 15:32:28.000000000 -0600
+++ ./docs/html/install_unix.html	2006-01-13 15:35:26.000000000 -0600
@@ -67,7 +67,7 @@
  • -

    Edit include/config.php and specify the MySQL user, password and database for your Cacti configuration.

    +

    Edit /etc/cacti/db.php and specify the MySQL user, password and database for your Cacti configuration.

     $database_default = "cacti";
 $database_hostname = "localhost";


--- NEW FILE cacti-httpd.conf ---
#
# Cacti: An rrd based graphing tool
#
Alias /cacti    /usr/share/cacti


	Order Deny,Allow
	Deny from all
	Allow from 127.0.0.1




--- NEW FILE cacti.README.Fedora ---
As of Feb. 6, 2006 Cacti does not work correctly with SELinux.  This will
change in the future.  If you're having issues getting Cacti to work properly
and SELinux is enabled, please run the following commands after installing
Cacti:

chcon -R -t httpd_sys_content_t /var/log/cacti/
chcon -R -t httpd_sys_content_t /var/lib/cacti/rra/




--- NEW FILE cacti.logrotate ---
/var/log/cacti/cacti.log {
	missingok
	monthly
	notifempty
	compress
	create 0664 cacti apache
}


--- NEW FILE cacti.spec ---
Name: cacti
Version: 0.8.6h
Release: 4
Summary: An rrd based graphing tool

Group: Applications/System
License: GPL
URL: http://www.cacti.net/
Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
Source1: cacti-httpd.conf
Source2: cacti.logrotate
Source3: cacti.README.Fedora
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
Requires(pre): %{_sbindir}/useradd
Requires(postun): /sbin/service 
BuildArch: noarch

Patch1: cacti-0.8.6h-dbcfg.patch
Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch
Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch

%description
Cacti is a complete frontend to RRDTool. It stores all of the
necessary information to create graphs and populate them with
data in a MySQL database. The frontend is completely PHP
driven. Along with being able to maintain graphs, data
sources, and round robin archives in a database, Cacti also
handles the data gathering. There is SNMP support for those
used to creating traffic graphs with MRTG.

%prep
%setup -q
%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1

echo "*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron

%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_docdir}/%{name}-%{version}
%{__install} -d -m 0755 %{buildroot}/%{_datadir}/%{name}/
%{__install} -m 0644 *.php %{buildroot}/%{_datadir}/%{name}/
%{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/
%{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/
%{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/
%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
%{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
%{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
%{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/cacti
%{__cp} -a images/ include/ install/ lib/ resource/ %{buildroot}%{_datadir}/%{name}
%{__cp} %{SOURCE3} ./docs/README.cacti
%{__cp} -a docs/ %{buildroot}/%{_docdir}/%{name}-%{version}
%{__mv} %{buildroot}/%{_datadir}/%{name}/include/db.php %{buildroot}/%{_sysconfdir}/%{name}/db.php
%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/cmd.php %{buildroot}/%{_datadir}/%{name}/poller.php
ln -s %{_sysconfdir}/%{name}/db.php %{buildroot}/%{_datadir}/%{name}/include/db.php
ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/
ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/
ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log

%clean
rm -rf %{buildroot}

%pre
%{_sbindir}/useradd -d %{_datadir}/%{name} -r -s /sbin/nologin cacti 2> /dev/null || :

%post
if [ $1 == 1 ]; then
	/sbin/service httpd condrestart > /dev/null 2>&1 || :
fi

%postun
/sbin/service httpd condrestart > /dev/null 2>&1 || :

%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_localstatedir}/lib/%{name}
%dir %{_localstatedir}/lib/%{name}/scripts
%doc docs/ README LICENSE cacti.sql
%config(noreplace) %{_sysconfdir}/cron.d/cacti
%config(noreplace) %{_sysconfdir}/httpd/conf.d/cacti.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%attr(0660,cacti,apache) %config(noreplace) %{_sysconfdir}/%{name}/db.php
%{_datadir}/%{name}/*.php
%{_datadir}/%{name}/images/
%{_datadir}/%{name}/include/
%{_datadir}/%{name}/install/
%{_datadir}/%{name}/lib/
%{_datadir}/%{name}/log
%{_datadir}/%{name}/resource/
%{_datadir}/%{name}/rra
%{_datadir}/%{name}/scripts
%{_localstatedir}/lib/%{name}/scripts/*[^p]
%attr(-,cacti,apache) %{_localstatedir}/log/%{name}/
%attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php

%changelog
* Mon Feb 6 2006 Mike McGrath  - 0.8.6h-4
- Fixed some scriptlets to always return 0
- Fixed extra '/' in logrotate
- Added README.Fedora

* Wed Jan 14 2006 Mike McGrath  - 0.8.6h-3
- Fixed device filter clear issue
- Fixed invalid SQL graph generation statement
- Fixed php warning for empty set non-existant rrd file
- Added MySQL 5.x 'strict mode' compatibility

* Mon Jan 09 2006 Mike McGrath  - 0.8.6h-1
- MySQL 5.x support
- IPv6 support to lib/ping.php
- Command line scripts for copying users, reindxing and rebuilding cache
- Many Bug fixes

* Tue Dec 18 2005 Mike McGrath  - 0.8.6g-7
- Separated database configs from config.php
- Fixed the 'short_open_tag" syntax error
- Fixed graph zoom graph bug
- Fixed SNMP auth bug
- Re-enables MIB file parsing in poller
- Created a Fedora frendly version of the RPM

* Wed Sep 7 2005 Ian Berry  - 0.8.6g-1
- Updated to release 0.8.6g.

* Mon Jul 1 2005 Ian Berry  - 0.8.6f-1
- Updated to release 0.8.6f.

* Mon Jun 20 2005 Ian Berry  - 0.8.6e-1
- Updated to release 0.8.6e.

* Wed Apr 26 2005 Ian Berry  - 0.8.6d-1
- Updated to release 0.8.6d.

* Wed Dec 12 2004 Ian Berry  - 0.8.6c-1
- Updated to release 0.8.6c.

* Wed Oct 5 2004 Ian Berry  - 0.8.6b-1
- Updated to release 0.8.6b.

* Sun Oct 3 2004 Ian Berry  - 0.8.6a-1
- Updated to release 0.8.6a.

* Sat Sep 11 2004 Ian Berry  - 0.8.6-1
- Updated to release 0.8.6.
- Broke cactid into its own package.

* Thu Apr 4 2004 Ian Berry  - 0.8.5a-1
- Initial package.


fix_search_session_clear_issue.patch:

--- NEW FILE fix_search_session_clear_issue.patch ---
--- cacti-0.8.6h/host.php	2006-01-03 21:08:30.000000000 -0600
+++ cacti-fixed/host.php	2006-01-06 22:45:51.630701318 -0600
@@ -726,18 +726,18 @@
 		unset($_REQUEST["host_status"]);
 	}
 
-	if (!empty($_SESSION["sess_host_status"])) {
-		if ($_SESSION["sess_host_status"] != $_REQUEST["host_status"]) {
-			$_REQUEST["page"] = 1;
-		}
-	}
-
 	/* remember these search fields in session vars so we don't have to keep passing them around */
 	load_current_session_value("page", "sess_device_current_page", "1");
 	load_current_session_value("filter", "sess_device_filter", "");
 	load_current_session_value("host_template_id", "sess_device_host_template_id", "-1");
 	load_current_session_value("host_status", "sess_host_status", "-1");
 
+	if (!empty($_SESSION["sess_host_status"])) {
+		if ($_SESSION["sess_host_status"] != $_REQUEST["host_status"]) {
+			$_REQUEST["page"] = 1;
+		}
+	}
+
 	html_start_box("Devices", "98%", $colors["header"], "3", "center", "host.php?action=edit&host_template_id=" . $_REQUEST["host_template_id"] . "&host_status=" . $_REQUEST["host_status"]);
 
 	include("./include/html/inc_device_filter_table.php");

fix_sql_syntax_related_to_default_rra_id.patch:

--- NEW FILE fix_sql_syntax_related_to_default_rra_id.patch ---
--- cacti-0.8.6h/graph.php	2006-01-03 21:08:30.000000000 -0600
+++ cacti-fixed/graph.php	2006-01-06 22:40:29.643671752 -0600
@@ -130,13 +130,13 @@
 	$timespan = -($rra["timespan"]);
 
 	/* find the step and how often this graph is updated with new data */
-	$ds_step = db_fetch_cell("select
+	$ds_step = db_fetch_cell("SELECT
 		data_template_data.rrd_step
-		from (data_template_data,data_template_rrd,graph_templates_item)
-		where graph_templates_item.task_item_id=data_template_rrd.id
-		and data_template_rrd.local_data_id=data_template_data.local_data_id
-		and graph_templates_item.local_graph_id=" . $_GET["local_graph_id"] .
-		"limit 0,1");
+		FROM (data_template_data,data_template_rrd,graph_templates_item)
+		WHERE graph_templates_item.task_item_id=data_template_rrd.id
+		AND data_template_rrd.local_data_id=data_template_data.local_data_id
+		AND graph_templates_item.local_graph_id=" . $_GET["local_graph_id"] .
+		" LIMIT 0,1");
 	$ds_step = empty($ds_step) ? 300 : $ds_step;
 	$seconds_between_graph_updates = ($ds_step * $rra["steps"]);
 

mysql_5x_strict.patch:

--- NEW FILE mysql_5x_strict.patch ---
diff -ruBbd cacti-0.8.6h/cacti.sql yak/cacti.sql
--- cacti-0.8.6h/cacti.sql	2006-01-03 22:08:36.000000000 -0500
+++ yak/cacti.sql	2006-01-07 16:21:36.406250000 -0500
@@ -1846,7 +1846,7 @@
   avg_time decimal(10,5) default '0.00000',
   total_polls int(12) unsigned default '0',
   failed_polls int(12) unsigned default '0',
-  availability decimal(7,5) NOT NULL default '100.00000',
+  availability decimal(8,5) NOT NULL default '100.00000',
   PRIMARY KEY  (id)
 ) TYPE=MyISAM;
 
diff -ruBbd cacti-0.8.6h/lib/database.php yak/lib/database.php
--- cacti-0.8.6h/lib/database.php	2006-01-03 22:08:36.000000000 -0500
+++ yak/lib/database.php	2006-01-07 14:43:36.156250000 -0500
@@ -214,14 +214,14 @@
    @arg $table_name - the name of the table to make the replacement in
    @arg $key_cols - the primary key(s)
    @returns - the auto incriment id column (if applicable) */
-function sql_save($array_items, $table_name, $key_cols = "id") {
+function sql_save($array_items, $table_name, $key_cols = "id", $autoinc = TRUE) {
 	global $cnn_id;
 
 	while (list ($key, $value) = each ($array_items)) {
 		$array_items[$key] = "\"" . sql_sanitize($value) . "\"";
 	}
 
-	if (!$cnn_id->Replace($table_name, $array_items, $key_cols, false)) { return 0; }
+	if (!$cnn_id->Replace($table_name, $array_items, $key_cols, FALSE, $autoinc)) { return 0; }
 
 	/* get the last AUTO_ID and return it */
 	if ($cnn_id->Insert_ID() == "0") {
diff -ruBbd cacti-0.8.6h/lib/template.php yak/lib/template.php
--- cacti-0.8.6h/lib/template.php	2006-01-03 22:08:36.000000000 -0500
+++ yak/lib/template.php	2006-01-07 15:08:31.953125000 -0500
@@ -643,10 +642,16 @@
 
 					/* if there are no '|' characters, all of the substitutions were successful */
 					if (!strstr($subs_string, "|query")) {
+						if (sizeof(db_fetch_row("show columns from data_template_data like '" . $suggested_value["field_name"] . "'"))) {
 						db_execute("update data_template_data set " . $suggested_value["field_name"] . "='" . addslashes($suggested_value["text"]) . "' where local_data_id=" . $cache_array["local_data_id"]{$data_template["id"]});
+						}
 
 						/* once we find a working value, stop */
 						$suggested_values_ds{$data_template["id"]}{$suggested_value["field_name"]} = true;
+
+						if (sizeof(db_fetch_row("show columns from data_template_rrd like '" . $suggested_value["field_name"] . "'"))) {
+							db_execute("update data_template_rrd set " . $suggested_value["field_name"] . "='" . $subs_string . "' where local_data_id=" . $cache_array["local_data_id"]{$data_template["id"]});
+						}
 					}
 				}
 			}

nth_percentile_empty_return_set_issue.patch:

--- NEW FILE nth_percentile_empty_return_set_issue.patch ---
--- cacti-0.8.6h/lib/graph_variables.php	2006-01-03 21:08:30.000000000 -0600
+++ cacti-fixed/lib/graph_variables.php	2006-01-06 22:40:31.032460462 -0600
@@ -302,27 +302,34 @@
 
 	/* format the output according to args passed to the variable */
 	if ($regexp_match_array[4] == "current") {
+		if (! empty($nth_cache{$graph_item["local_data_id"]}{$graph_item["data_source_name"]})) {
 		$nth = $nth_cache{$graph_item["local_data_id"]}{$graph_item["data_source_name"]};
 		$nth = ($regexp_match_array[2] == "bits") ? $nth * 8 : $nth;
 		$nth /= pow(10,intval($regexp_match_array[3]));
+		}
 	}elseif ($regexp_match_array[4] == "total") {
 		for ($t=0;($t

Author: mmcgrath

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

Modified Files:
	owners.list 
Log Message:
Added cacti owner information



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -r1.616 -r1.617
--- owners.list	6 Feb 2006 21:51:54 -0000	1.616
+++ owners.list	7 Feb 2006 02:24:05 -0000	1.617
@@ -93,6 +93,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|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Feb  7 02:59:12 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon,  6 Feb 2006 21:59:12 -0500
Subject: rpms/nagios/FC-3 nagios.htaccess,NONE,1.1 nagios.spec,1.2,1.3
Message-ID: <200602070259.k172xied013914@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Added Files:
	nagios.htaccess 
Log Message:
Updates to Apache config.  Updated FC3 to 2.0 branch.



--- NEW FILE nagios.htaccess ---
ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/

   Options ExecCGI
   order deny,allow
   deny from all
   allow from 127.0.0.1
   AuthType Basic
   AuthUserFile /etc/nagios/passwd
   AuthName "nagios"
   require valid-user


Alias /nagios/ /usr/share/nagios/html/

   Options None
   order deny,allow
   deny from all
   allow from 127.0.0.1
   AuthType Basic
   AuthUserFile /etc/nagios/passwd
   AuthName "nagios"
   require valid-user


# For SSL-servers
#
#   Options ExecCGI
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   allow from 127.0.0.1
#   AuthType Basic
#   AuthUserFile /etc/nagios/passwd
#   AuthName "nagios"
#   require valid-user
#
#
#Alias /nagios/ /usr/share/nagios/html/
#
#   Options None
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   allow from 127.0.0.1
#   AuthType Basic
#   AuthUserFile /etc/nagios/passwd
#   AuthName "nagios"
#   require valid-user
#



Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.spec	19 Jan 2006 23:22:41 -0000	1.2
+++ nagios.spec	7 Feb 2006 02:59:12 -0000	1.3
@@ -1,20 +1,21 @@
 Name: nagios
-Version: 1.3
-Release: 14%{?dist}
+Version: 2.0
+Release: 0.3.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
 License: GPL
 URL: http://www.nagios.org/
-Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}rc2.tar.gz
 Source1: nagios.logrotate
+Source2: nagios.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gd-devel > 1.8
+BuildRequires: gd-devel > 1.8, mailx
 Requires: httpd
 Requires(pre): %{_sbindir}/useradd
-Requires(preun): /sbin/service /sbin/chkconfig
-Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/usermod
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod
 Requires(postun): /sbin/service
 
 %description
@@ -49,7 +50,7 @@
 may compile against.
 
 %prep
-%setup -q
+%setup -q -n nagios-2.0rc2
 
 %build
 ./configure \
@@ -78,9 +79,9 @@
 	 -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/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
+%{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess
 %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
-%{__sed} -e "s|/usr/lib/nagios/cgi/|%{_libdir}/%{name}/cgi-bin/|" \
-	 -e "s|/usr/share/nagios/|%{_datadir}/%{name}/html/|" < contrib/htaccess.sample > contrib/htaccess.sample.fedora
+echo >> html/stylesheets/common.css
 
 %install
 rm -rf %{buildroot}
@@ -94,8 +95,8 @@
 %{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
-%{__install} -D -m 0644 common/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-%{__install} -D -m 0644 contrib/htaccess.sample.fedora %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
+%{__install} -D -m 0644 %{name}.htaccess %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
 %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
 %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
@@ -133,7 +134,7 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/html
 %doc %{_datadir}/%{name}/html/docs
-%doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
+%doc Changelog INSTALLING LICENSE README UPGRADING 
 %{_datadir}/%{name}/html/[^d]*
 %{_sbindir}/*
 %{_libdir}/%{name}/cgi-bin/*cgi
@@ -153,6 +154,19 @@
 %{_includedir}/%{name}
 
 %changelog
+* Mon Feb 06 2006 Mike McGrath  2.0-0.3.rc2
+- Added proper basic Auth to Apache config for non SSL users
+
+* Sat Feb 04 2006 Mike McGrath  2.0-0.2.rc2
+- Fixed default options in Apache config
+- Fixed %{_libdir} in Apache config for x86_64 machines
+
+* Fri Jan 27 2006 Mike McGrath  2.0-0.1.rc2
+- Using 2.0rc2 tarball
+
+* Thu Jan 26 2006 Mike McGrath  1.3-15
+- Fixed usermod -a issue, Bugzilla #49609
+
 * Sun Jan 15 2005 Mike McGrath  1.3-14
 - Fedora friendly spec file
 



From fedora-extras-commits at redhat.com  Tue Feb  7 02:59:18 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon,  6 Feb 2006 21:59:18 -0500
Subject: rpms/nagios/FC-4 nagios.htaccess,1.2,1.3 nagios.spec,1.5,1.6
Message-ID: <200602070259.k172xo2t013918@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.htaccess nagios.spec 
Log Message:
Updates to Apache config.  Updated FC3 to 2.0 branch.



Index: nagios.htaccess
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.htaccess,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.htaccess	4 Feb 2006 22:55:40 -0000	1.2
+++ nagios.htaccess	7 Feb 2006 02:59:17 -0000	1.3
@@ -4,6 +4,9 @@
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   AuthType Basic
+   AuthUserFile /etc/nagios/passwd
+   AuthName "nagios"
    require valid-user
 
 
@@ -13,16 +16,19 @@
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   AuthType Basic
+   AuthUserFile /etc/nagios/passwd
+   AuthName "nagios"
    require valid-user
 
 
 # For SSL-servers
-#ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
 #
 #   Options ExecCGI
 #   SSLRequireSSL
 #   order deny,allow
 #   deny from all
+#   allow from 127.0.0.1
 #   AuthType Basic
 #   AuthUserFile /etc/nagios/passwd
 #   AuthName "nagios"
@@ -35,6 +41,7 @@
 #   SSLRequireSSL
 #   order deny,allow
 #   deny from all
+#   allow from 127.0.0.1
 #   AuthType Basic
 #   AuthUserFile /etc/nagios/passwd
 #   AuthName "nagios"


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nagios.spec	4 Feb 2006 22:55:40 -0000	1.5
+++ nagios.spec	7 Feb 2006 02:59:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.2.rc2%{?dist}
+Release: 0.3.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -154,6 +154,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Mon Feb 06 2006 Mike McGrath  2.0-0.3.rc2
+- Added proper basic Auth to Apache config for non SSL users
+
 * Sat Feb 04 2006 Mike McGrath  2.0-0.2.rc2
 - Fixed default options in Apache config
 - Fixed %{_libdir} in Apache config for x86_64 machines



From fedora-extras-commits at redhat.com  Tue Feb  7 02:59:23 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon,  6 Feb 2006 21:59:23 -0500
Subject: rpms/nagios/devel nagios.htaccess,1.2,1.3 nagios.spec,1.5,1.6
Message-ID: <200602070259.k172xuTX013922@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.htaccess nagios.spec 
Log Message:
Updates to Apache config.  Updated FC3 to 2.0 branch.



Index: nagios.htaccess
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.htaccess,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.htaccess	4 Feb 2006 22:47:50 -0000	1.2
+++ nagios.htaccess	7 Feb 2006 02:59:23 -0000	1.3
@@ -4,6 +4,9 @@
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   AuthType Basic
+   AuthUserFile /etc/nagios/passwd
+   AuthName "nagios"
    require valid-user
 
 
@@ -13,16 +16,19 @@
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   AuthType Basic
+   AuthUserFile /etc/nagios/passwd
+   AuthName "nagios"
    require valid-user
 
 
 # For SSL-servers
-#ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
 #
 #   Options ExecCGI
 #   SSLRequireSSL
 #   order deny,allow
 #   deny from all
+#   allow from 127.0.0.1
 #   AuthType Basic
 #   AuthUserFile /etc/nagios/passwd
 #   AuthName "nagios"
@@ -35,6 +41,7 @@
 #   SSLRequireSSL
 #   order deny,allow
 #   deny from all
+#   allow from 127.0.0.1
 #   AuthType Basic
 #   AuthUserFile /etc/nagios/passwd
 #   AuthName "nagios"


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nagios.spec	4 Feb 2006 22:47:50 -0000	1.5
+++ nagios.spec	7 Feb 2006 02:59:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.2.rc2%{?dist}
+Release: 0.3.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -154,6 +154,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Mon Feb 06 2006 Mike McGrath  2.0-0.3.rc2
+- Added proper basic Auth to Apache config for non SSL users
+
 * Sat Feb 04 2006 Mike McGrath  2.0-0.2.rc2
 - Fixed default options in Apache config
 - Fixed %{_libdir} in Apache config for x86_64 machines



From fedora-extras-commits at redhat.com  Tue Feb  7 03:19:33 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon,  6 Feb 2006 22:19:33 -0500
Subject: rpms/nagios/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200602070320.k173K5X3015942@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	.cvsignore sources 
Log Message:
Added nagios-2.0rc2.tar.gz to the FC-3 tree - Forgot to do it earlier


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 22:47:20 -0000	1.2
+++ .cvsignore	7 Feb 2006 03:19:32 -0000	1.3
@@ -1 +1 @@
-nagios-1.3.tar.gz
+nagios-2.0rc2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 22:47:20 -0000	1.2
+++ sources	7 Feb 2006 03:19:32 -0000	1.3
@@ -1 +1 @@
-2011df334cb0206dbb054606c6a2dc84  nagios-1.3.tar.gz
+373124639093919dc8858a243d760f84  nagios-2.0rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb  7 03:25:44 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Mon,  6 Feb 2006 22:25:44 -0500
Subject: rpms/nagios/FC-3 nagios.spec,1.3,1.4
Message-ID: <200602070326.k173QGVf015979@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Log Message:
New tag for Nagios and FC3



Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/nagios.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nagios.spec	7 Feb 2006 02:59:12 -0000	1.3
+++ nagios.spec	7 Feb 2006 03:25:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.3.rc2%{?dist}
+Release: 0.4.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -154,7 +154,7 @@
 %{_includedir}/%{name}
 
 %changelog
-* Mon Feb 06 2006 Mike McGrath  2.0-0.3.rc2
+* Mon Feb 06 2006 Mike McGrath  2.0-0.4.rc2
 - Added proper basic Auth to Apache config for non SSL users
 
 * Sat Feb 04 2006 Mike McGrath  2.0-0.2.rc2



From fedora-extras-commits at redhat.com  Tue Feb  7 05:01:26 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Tue,  7 Feb 2006 00:01:26 -0500
Subject: rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors.spec,1.3,1.4
Message-ID: <200602070502.k17525tF019757@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-sensors/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17973

Modified Files:
	gnome-applet-sensors.spec 
Log Message:
Adding lm-sensors Requires per Bugzilla report



Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/gnome-applet-sensors.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-sensors.spec	20 Sep 2005 07:26:35 -0000	1.3
+++ gnome-applet-sensors.spec	7 Feb 2006 05:01:25 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnome-applet-sensors
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 
 Group:          User Interface/Desktops
@@ -12,7 +12,7 @@
 
 BuildRequires: gettext
 BuildRequires: gnome-panel-devel >= 2.8
-
+Requires: lm-sensors
 
 %description
 GNOME Sensors Applet is an applet for the GNOME Panel to display readings
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Mon Feb 06 2006 Aaron Kurtz  - 1.4-2
+- add lm-sensors requires
+
 * Tue Sep 20 2005 Aaron Kurtz  - 1.4-1
 - bump to stable release 1.4
 



From fedora-extras-commits at redhat.com  Tue Feb  7 08:29:16 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue,  7 Feb 2006 03:29:16 -0500
Subject: rpms/python-enchant/devel .cvsignore, 1.2, 1.3 python-enchant.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200602070829.k178TmrW026074@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	.cvsignore python-enchant.spec sources 
Log Message:
* Sat Feb 04 2006 Roozbeh Pournader  - 1.1.5-1
- Update to 1.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Feb 2006 14:50:42 -0000	1.2
+++ .cvsignore	7 Feb 2006 08:29:15 -0000	1.3
@@ -1 +1 @@
-pyenchant-1.1.3.tar.gz
+pyenchant-1.1.5.tar.gz


Index: python-enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-enchant.spec	1 Feb 2006 16:07:44 -0000	1.3
+++ python-enchant.spec	7 Feb 2006 08:29:15 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-enchant
-Version:        1.1.3
-Release:        3%{?dist}
+Version:        1.1.5
+Release:        1%{?dist}
 Summary:        Python bindings for Enchant spellchecking library
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel enchant-devel
+BuildRequires:  python-setuptools >= 0:0.6a9
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Provides:       PyEnchant
@@ -31,7 +32,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
+rm -rf $RPM_BUILD_ROOT/%{python_sitearch}/*.egg-info
 
  
 %clean
@@ -54,6 +56,9 @@
 
 
 %changelog
+* Sat Feb 04 2006 Roozbeh Pournader  - 1.1.5-1
+- Update to 1.1.5
+
 * Wed Feb 01 2006 Roozbeh Pournader  - 1.1.3-3
 - Use %%{python_sitearch} instead of %%{python_sitelib} (for x86_64)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Feb 2006 14:50:42 -0000	1.2
+++ sources	7 Feb 2006 08:29:15 -0000	1.3
@@ -1 +1 @@
-31bb75201ec0252793e2b5b57df683c0  pyenchant-1.1.3.tar.gz
+d9a07392f1f0910635a221273ac9654d  pyenchant-1.1.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb  7 08:38:00 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue,  7 Feb 2006 03:38:00 -0500
Subject: rpms/translate-toolkit/devel translate-toolkit.spec,1.3,1.4
Message-ID: <200602070838.k178cWL3026187@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26170

Modified Files:
	translate-toolkit.spec 
Log Message:
* Tue Feb 07 2006 Roozbeh Pournader  - 0.8-0.8.rc6
- Require python-enchant for spellchecking support in pofilter



Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/devel/translate-toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- translate-toolkit.spec	4 Feb 2006 14:10:28 -0000	1.3
+++ translate-toolkit.spec	7 Feb 2006 08:38:00 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           translate-toolkit
 Version:        0.8
-Release:        0.7.%{alphatag}%{?dist}
+Release:        0.8.%{alphatag}%{?dist}
 Summary:        A collection of tools to assist software localization
 
 Group:          Development/Tools
@@ -17,6 +17,7 @@
 BuildArch:      noarch
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:       python-elementtree
+Requires:       python-enchant
 
 %description
 The Translate Toolkit includes programs to convert various localization
@@ -64,6 +65,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Roozbeh Pournader  - 0.8-0.8.rc6
+- Require python-enchant for spellchecking support in pofilter
+
 * Sat Feb 04 2006 Roozbeh Pournader  - 0.8-0.7.rc6
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb  7 08:45:37 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue,  7 Feb 2006 03:45:37 -0500
Subject: rpms/python-enchant/devel python-enchant.spec,1.4,1.5
Message-ID: <200602070846.k178kADk026323@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	python-enchant.spec 
Log Message:
* Tue Feb 07 2006 Roozbeh Pournader  - 1.1.5-2
- Rebuild



Index: python-enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-enchant.spec	7 Feb 2006 08:29:15 -0000	1.4
+++ python-enchant.spec	7 Feb 2006 08:45:37 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           python-enchant
 Version:        1.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for Enchant spellchecking library
 
 Group:          Development/Languages
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Roozbeh Pournader  - 1.1.5-2
+- Rebuild
+
 * Sat Feb 04 2006 Roozbeh Pournader  - 1.1.5-1
 - Update to 1.1.5
 



From fedora-extras-commits at redhat.com  Tue Feb  7 09:06:53 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue,  7 Feb 2006 04:06:53 -0500
Subject: rpms/translate-toolkit/FC-4 translate-toolkit.spec,1.2,1.3
Message-ID: <200602070907.k1797PCs028514@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28489

Modified Files:
	translate-toolkit.spec 
Log Message:
* Tue Feb 07 2006 Roozbeh Pournader  - 0.8-0.8.rc6
- Require python-enchant for spellchecking support in pofilter

* Sat Feb 04 2006 Roozbeh Pournader  - 0.8-0.7.rc6
- Rebuild



Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/FC-4/translate-toolkit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- translate-toolkit.spec	4 Feb 2006 13:47:58 -0000	1.2
+++ translate-toolkit.spec	7 Feb 2006 09:06:53 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           translate-toolkit
 Version:        0.8
-Release:        0.6.%{alphatag}%{?dist}
+Release:        0.8.%{alphatag}%{?dist}
 Summary:        A collection of tools to assist software localization
 
 Group:          Development/Tools
@@ -17,6 +17,7 @@
 BuildArch:      noarch
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:       python-elementtree
+Requires:       python-enchant
 
 %description
 The Translate Toolkit includes programs to convert various localization
@@ -64,6 +65,12 @@
 
 
 %changelog
+* Tue Feb 07 2006 Roozbeh Pournader  - 0.8-0.8.rc6
+- Require python-enchant for spellchecking support in pofilter
+
+* Sat Feb 04 2006 Roozbeh Pournader  - 0.8-0.7.rc6
+- Rebuild
+
 * Sat Feb 04 2006 Roozbeh Pournader  - 0.8-0.6.rc6
 - Update to 0.8rc6
 



From fedora-extras-commits at redhat.com  Tue Feb  7 09:07:45 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue,  7 Feb 2006 04:07:45 -0500
Subject: rpms/python-enchant/FC-4 python-enchant.spec, 1.3, 1.4 sources, 1.2,
	1.3
Message-ID: <200602070908.k1798IdQ028546@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	python-enchant.spec sources 
Log Message:
* Tue Feb 07 2006 Roozbeh Pournader  - 1.1.5-2
- Rebuild

* Sat Feb 04 2006 Roozbeh Pournader  - 1.1.5-1
- Update to 1.1.5



Index: python-enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/FC-4/python-enchant.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-enchant.spec	1 Feb 2006 16:07:44 -0000	1.3
+++ python-enchant.spec	7 Feb 2006 09:07:45 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-enchant
-Version:        1.1.3
-Release:        3%{?dist}
+Version:        1.1.5
+Release:        2%{?dist}
 Summary:        Python bindings for Enchant spellchecking library
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel enchant-devel
+BuildRequires:  python-setuptools >= 0:0.6a9
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Provides:       PyEnchant
@@ -31,7 +32,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
+rm -rf $RPM_BUILD_ROOT/%{python_sitearch}/*.egg-info
 
  
 %clean
@@ -54,6 +56,12 @@
 
 
 %changelog
+* Tue Feb 07 2006 Roozbeh Pournader  - 1.1.5-2
+- Rebuild
+
+* Sat Feb 04 2006 Roozbeh Pournader  - 1.1.5-1
+- Update to 1.1.5
+
 * Wed Feb 01 2006 Roozbeh Pournader  - 1.1.3-3
 - Use %%{python_sitearch} instead of %%{python_sitelib} (for x86_64)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Feb 2006 14:50:42 -0000	1.2
+++ sources	7 Feb 2006 09:07:45 -0000	1.3
@@ -1 +1 @@
-31bb75201ec0252793e2b5b57df683c0  pyenchant-1.1.3.tar.gz
+d9a07392f1f0910635a221273ac9654d  pyenchant-1.1.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb  7 11:50:38 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  7 Feb 2006 06:50:38 -0500
Subject: rpms/perl-Math-GMP - New directory
Message-ID: <200602071150.k17Boed4000419@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-GMP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv411/perl-Math-GMP

Log Message:
Directory /cvs/extras/rpms/perl-Math-GMP added to the repository




From fedora-extras-commits at redhat.com  Tue Feb  7 11:50:44 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  7 Feb 2006 06:50:44 -0500
Subject: rpms/perl-Math-GMP/devel - New directory
Message-ID: <200602071150.k17BokYS000438@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-GMP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv411/perl-Math-GMP/devel

Log Message:
Directory /cvs/extras/rpms/perl-Math-GMP/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Feb  7 11:51:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  7 Feb 2006 06:51:10 -0500
Subject: rpms/perl-Math-GMP Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602071151.k17BpC2D000472@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-GMP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv460

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Math-GMP


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb  7 11:51:16 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  7 Feb 2006 06:51:16 -0500
Subject: rpms/perl-Math-GMP/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602071151.k17BpIVc000492@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-GMP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv460/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Math-GMP


--- NEW 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 Feb  7 11:53:12 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  7 Feb 2006 06:53:12 -0500
Subject: rpms/perl-Math-GMP import.log,1.1,1.2
Message-ID: <200602071153.k17BrjHw000560@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-GMP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv526

Modified Files:
	import.log 
Log Message:
auto-import perl-Math-GMP-2.04-1 on branch devel from perl-Math-GMP-2.04-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-GMP/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Feb 2006 11:51:10 -0000	1.1
+++ import.log	7 Feb 2006 11:53:12 -0000	1.2
@@ -0,0 +1 @@
+perl-Math-GMP-2_04-1:HEAD:perl-Math-GMP-2.04-1.src.rpm:1139313176



From fedora-extras-commits at redhat.com  Tue Feb  7 11:53:18 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  7 Feb 2006 06:53:18 -0500
Subject: rpms/perl-Math-GMP/devel perl-Math-GMP.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602071153.k17BrpNx000564@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-GMP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv526/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Math-GMP.spec 
Log Message:
auto-import perl-Math-GMP-2.04-1 on branch devel from perl-Math-GMP-2.04-1.src.rpm


--- NEW FILE perl-Math-GMP.spec ---
Summary:	High speed arbitrary size integer math
Name:		perl-Math-GMP
Version:	2.04
Release:	1%{?dist}
License:	LGPL
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Math-GMP/
Source0:	http://search.cpan.org/CPAN/authors/id/C/CH/CHIPT/Math-GMP-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires:	gmp-devel

%description
Math::GMP was designed to be a drop-in replacement both for Math::BigInt and
for regular integer arithmetic. Unlike BigInt, though, Math::GMP uses the GNU
gmp library for all of its calculations, as opposed to straight Perl functions.
This can result in speed improvements.

%prep
%setup -q -n Math-GMP-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc README Changes LICENSE
%{perl_vendorarch}/Math/
%{perl_vendorarch}/auto/Math/
%{_mandir}/man3/Math::GMP.3pm*

%changelog
* Tue Nov 29 2005 Paul Howarth  2.04-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-GMP/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Feb 2006 11:51:16 -0000	1.1
+++ .cvsignore	7 Feb 2006 11:53:18 -0000	1.2
@@ -0,0 +1 @@
+Math-GMP-2.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-GMP/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Feb 2006 11:51:16 -0000	1.1
+++ sources	7 Feb 2006 11:53:18 -0000	1.2
@@ -0,0 +1 @@
+291e5847986c7591cd70c1788c979a98  Math-GMP-2.04.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb  7 12:20:21 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue,  7 Feb 2006 07:20:21 -0500
Subject: rpms/allegro/devel allegro-4.2.0-digmid.patch, NONE,
	1.1 allegro.spec, 1.22, 1.23
Message-ID: <200602071220.k17CKrfM002514@cvs-int.fedora.redhat.com>

Author: jnovy

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

Modified Files:
	allegro.spec 
Added Files:
	allegro-4.2.0-digmid.patch 
Log Message:
- fix digmid loading of timidity midi patches (#180154)


allegro-4.2.0-digmid.patch:

--- NEW FILE allegro-4.2.0-digmid.patch ---
--- allegro-4.2.0/src/digmid.c.digmid	2004-09-03 11:30:22.000000000 +0200
+++ allegro-4.2.0/src/digmid.c	2006-02-01 16:35:03.000000000 +0100
@@ -519,7 +519,7 @@
 {
    PACKFILE *f;
    char dir[1024], file[1024], buf[1024], filename[1024];
-   char todo[256][32];
+   char todo[256][1024];
    char *argv[16], *p;
    char tmp[128];
    int argc;
@@ -679,8 +679,11 @@
       /* read from regular disk files */
       for (i=0; i<256; i++) {
 	 if (ugetc(todo[i])) {
-	    ustrzcpy(filename, sizeof(filename), dir);
-	    ustrzcat(filename, sizeof(filename), todo[i]);
+	    if (is_relative_filename(todo[i])) {
+	       ustrzcpy(filename, sizeof(filename), dir);
+	       ustrzcat(filename, sizeof(filename), todo[i]);
+            } else
+	       ustrzcpy(filename, sizeof(filename), todo[i]);
 
 	    if (ugetc(get_extension(filename)) == 0)
 	       ustrzcat(filename, sizeof(filename), uconvert_ascii(".pat", tmp));


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- allegro.spec	25 Jan 2006 10:07:50 -0000	1.22
+++ allegro.spec	7 Feb 2006 12:20:21 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        5
+Release:        6
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -15,6 +15,7 @@
 Patch1:         allegro-4.0.3-libdir.patch
 Patch2:         allegro-4.0.3-cfg.patch
 Patch3:         allegro-4.2.0-nostrip.patch
+Patch4:         allegro-4.2.0-digmid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -121,6 +122,7 @@
 %patch1 -p0 -b .libdir
 %patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
+%patch4 -p1 -z .digmid
 
 %build
 %configure \
@@ -207,6 +209,9 @@
 
 
 %changelog
+* Tue Feb  7 2006 Jindrich Novy  4.2.0-6
+- fix digmid loading of timidity midi patches (#180154)
+
 * Wed Jan 25 2006 Jindrich Novy  4.2.0-5
 - update default allegro configuration to use sound successfully,
   thanks to Hans de Goede (#178383)



From fedora-extras-commits at redhat.com  Tue Feb  7 12:22:57 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  7 Feb 2006 07:22:57 -0500
Subject: owners owners.list,1.617,1.618
Message-ID: <200602071223.k17CNTsG002592@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	owners.list 
Log Message:
Add perl-Math-GMP



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.617
retrieving revision 1.618
diff -u -r1.617 -r1.618
--- owners.list	7 Feb 2006 02:24:05 -0000	1.617
+++ owners.list	7 Feb 2006 12:22:57 -0000	1.618
@@ -895,6 +895,7 @@
 Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Feb  7 12:34:51 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  7 Feb 2006 07:34:51 -0500
Subject: rpms/perl-Math-GMP/devel perl-Math-GMP-2.04-x86_64.patch, NONE,
	1.1 perl-Math-GMP.spec, 1.1, 1.2
Message-ID: <200602071235.k17CZNJY002679@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-GMP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2659

Modified Files:
	perl-Math-GMP.spec 
Added Files:
	perl-Math-GMP-2.04-x86_64.patch 
Log Message:
Attempt to fix testsuite failure on 64-bit arches


perl-Math-GMP-2.04-x86_64.patch:

--- NEW FILE perl-Math-GMP-2.04-x86_64.patch ---
--- t/gmppm.t
+++ t/gmppm.t	2005-05-11 08:29:44.880345280 +0200
@@ -418,16 +418,16 @@
 -5000:i2:13
 &uintify
 +15:15
-+9999999999:1410065407
-+99999999999:1215752191
-+999999999999:3567587327
++9999999999:9999999999
++99999999999:99999999999
++999999999999:999999999999
 &add_ui
 +999999:i1:1000000
 +9999999:i1:10000000
 +99999999:i1:100000000
 &intify
 +999999999:999999999
-+9999999999:1410065407
++9999999999:9999999999
 &mul_2exp
 +9999:i9:5119488
 +99999:i9:51199488


Index: perl-Math-GMP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-GMP/devel/perl-Math-GMP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-GMP.spec	7 Feb 2006 11:53:18 -0000	1.1
+++ perl-Math-GMP.spec	7 Feb 2006 12:34:50 -0000	1.2
@@ -1,11 +1,12 @@
 Summary:	High speed arbitrary size integer math
 Name:		perl-Math-GMP
 Version:	2.04
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-GMP/
 Source0:	http://search.cpan.org/CPAN/authors/id/C/CH/CHIPT/Math-GMP-%{version}.tar.gz
+Patch0:		perl-Math-GMP-2.04-x86_64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	gmp-devel
@@ -18,6 +19,9 @@
 
 %prep
 %setup -q -n Math-GMP-%{version}
+%ifarch x86_64 ppc64
+%patch0 -p0
+%endif
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
@@ -45,5 +49,8 @@
 %{_mandir}/man3/Math::GMP.3pm*
 
 %changelog
+* Tue Feb  7 2006 Paul Howarth  2.04-2
+- Apply patch to fix broken testsuite on 64-bit arches (CPAN RT#12751)
+
 * Tue Nov 29 2005 Paul Howarth  2.04-1
 - Initial build



From fedora-extras-commits at redhat.com  Tue Feb  7 13:28:11 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  7 Feb 2006 08:28:11 -0500
Subject: fedora-security/audit fc4,1.146,1.147 fc5,1.55,1.56
Message-ID: <200602071328.k17DSBN4004794@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
Note new kernel issue and rawhide stuff



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- fc4	6 Feb 2006 17:25:10 -0000	1.146
+++ fc4	7 Feb 2006 13:28:03 -0000	1.147
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20060202
-Up to date FC4 as of 20060202
+Up to date CVE as of CVE email 20060206
+Up to date FC4 as of 20060206
 
 ** are items that need attention
 
@@ -8,6 +8,7 @@
 CVE-2006-0496 VULNERABLE (firefox)
 CVE-2006-0482 ignore (kernel) sparc only
 CVE-2006-0481 version (libpng, 1.2.7 only)
+CVE-2006-0454 VULNERABLE (kernel, fixed 2.6.15.3)
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- fc5	6 Feb 2006 10:12:02 -0000	1.55
+++ fc5	7 Feb 2006 13:28:03 -0000	1.56
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20060205
+Up to date CVE as of CVE email 20060206
 Up to date FC5 as of FC5-Test2-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -20,12 +20,13 @@
 CVE-2006-0496 VULNERABLE (firefox) not fixed upstream
 CVE-2006-0482 ignore (kernel) sparc only
 CVE-2006-0481 version (libpng, 1.2.7 only)
+CVE-2006-0454 VULNERABLE (kernel, fixed 2.6.15.3)
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724:rawhide
 CVE-2006-0301 VULNERABLE (xpdf) bz#179423
 CVE-2006-0301 VULNERABLE (poppler) bz#179424
-CVE-2006-0301 VULNERABLE (kdegraphics) bz#179425
+CVE-2006-0301 VULNERABLE (kdegraphics) bz#179425:rawhide
 CVE-2006-0299 VULNERABLE (firefox, fixed 1.5.0.1)
 CVE-2006-0299 version (mozilla, 1.8 branch only)
 CVE-2006-0299 VULNERABLE (thunderbird)
@@ -50,7 +51,7 @@
 CVE-2006-0292 VULNERABLE (firefox, fixed 1.5.1)
 CVE-2006-0292 VULNERABLE (mozilla)
 CVE-2006-0292 VULNERABLE (thunderbird)
-CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
+CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179:rawhide
 CVE-2006-0236 ignore (thunderbird) windows only
 CVE-2006-0225 VULNERABLE (openssh) fc4 bz#168167
 CVE-2006-0208 VULNERABLE (php) fc4 bz#178036



From fedora-extras-commits at redhat.com  Tue Feb  7 16:53:21 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue,  7 Feb 2006 11:53:21 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.14,1.15
Message-ID: <200602071653.k17Grrd7010667@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10650

Modified Files:
	xchat-gnome.spec 
Log Message:
* Tue Feb  7 2006 Brian Pepple  - 0.9-4
- Rebuild due to new libsexy.



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xchat-gnome.spec	23 Jan 2006 15:48:40 -0000	1.14
+++ xchat-gnome.spec	7 Feb 2006 16:53:20 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           xchat-gnome
 Version:        0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Tue Feb  7 2006 Brian Pepple  - 0.9-4
+- Rebuild due to new libsexy.
+
 * Mon Jan 23 2006 Brian Pepple  - 0.9-3
 - Bump.
 



From fedora-extras-commits at redhat.com  Tue Feb  7 17:48:27 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  7 Feb 2006 12:48:27 -0500
Subject: rpms/cone/devel cone-0.66.20060203-compile.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 cone.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200602071748.k17HmxSn012878@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore cone.spec sources 
Added Files:
	cone-0.66.20060203-compile.patch 
Log Message:
- Update to 0.66.20060203 (development snapshot, needed to fix compilation
  with g++ 4.1)
- Patch a few more g++ 4.1 issues


cone-0.66.20060203-compile.patch:

--- NEW FILE cone-0.66.20060203-compile.patch ---
--- ./cone/myserver.H.orig	2004-06-22 19:55:22.000000000 -0500
+++ ./cone/myserver.H	2006-02-06 10:50:39.000000000 -0600
@@ -182,7 +182,7 @@
 
 	static std::string getConfigDir();
 	static std::string getHomeDir();
-	static std::string myServer::getConfigFilename();
+	static std::string getConfigFilename();
 
 	static void saveconfig(bool saveRemote=true,
 			       bool installRemote=false);
--- ./cone/cursesmessage.H.orig	2005-06-29 21:55:49.000000000 -0500
+++ ./cone/cursesmessage.H	2006-02-06 10:53:58.000000000 -0600
@@ -86,9 +86,9 @@
 	// Returns the "image" of line #lineNum, a list of
 	// attribute/text pairs.
 
-	void CursesMessage::drawLine(size_t lineNum,
-				     Curses *window,
-				     size_t windowLineNum);
+	void drawLine(size_t lineNum,
+		      Curses *window,
+		      size_t windowLineNum);
 
 	std::string shownMimeId; // Non "" if showing an attached message.
 private:
--- ./cone/spellcheckerAspell.H.orig	2003-06-21 22:59:52.000000000 -0500
+++ ./cone/spellcheckerAspell.H	2006-02-06 10:57:24.000000000 -0600
@@ -90,7 +90,7 @@
 	virtual void setDictionary(std::string);
 
 	SpellCheckerBase::Manager
-	*SpellChecker::getManager(std::string &errmsg);
+	*getManager(std::string &errmsg);
 };
 
 #endif
--- cone/cursesedit.H.orig	2004-11-19 20:37:20.000000000 -0600
+++ cone/cursesedit.H	2006-02-07 10:43:22.000000000 -0600
@@ -223,7 +223,7 @@
 		  bool saveFcc);
 
 private:
-	std::string CursesEdit::getFcc(SaveSink *sink);
+	std::string getFcc(SaveSink *sink);
 
 	std::string sender;		   // Initialized by save()
 	std::vector recipients; // Initialized by save()


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 01:32:56 -0000	1.6
+++ .cvsignore	7 Feb 2006 17:48:27 -0000	1.7
@@ -1 +1,2 @@
-cone-0.66.tar.bz2
+cone-0.66.20060203.tar.bz2
+cone-0.66.20060203.tar.bz2.sig


Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cone.spec	3 Feb 2006 01:32:56 -0000	1.13
+++ cone.spec	7 Feb 2006 17:48:27 -0000	1.14
@@ -2,12 +2,15 @@
 
 Summary:        CONE mail reader
 Name:           cone
-Version:        0.66
+Version:        0.66.20060203
 Release:        1%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
-Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
-Source1:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2.sig
+#Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
+#Source1:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2.sig
+Source0:        http://www.courier-mta.org/beta/cone/cone-%{version}.tar.bz2
+Source1:        http://www.courier-mta.org/beta/cone/cone-%{version}.tar.bz2.sig
+Patch0:         cone-0.66.20060203-compile.patch
 License:        GPL
 Group:          Applications/Internet
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -42,6 +45,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}"
@@ -87,7 +91,7 @@
 %{_libexecdir}/cone
 %{_datadir}/cone
 %{_mandir}/man1/*
-%{_libdir}/*.so
+#%{_libdir}/*.so
 %doc ABOUT-NLS ChangeLog README NEWS AUTHORS COPYING COPYING.GPL
 
 %files devel
@@ -101,12 +105,17 @@
 %doc cone/html
 
 %changelog
+* Sat Feb 04 2006 Steven Pritchard  0.66.20060203-1
+- Update to 0.66.20060203 (development snapshot, needed to fix compilation
+  with g++ 4.1)
+- Patch a few more g++ 4.1 issues
+
 * Thu Feb 02 2006 Steven Pritchard  0.66-1
 - Update to 0.66
 - Spec cleanup (reformatting)
 
 * Mon Nov 14 2005 Steven Pritchard  0.65-3
-- Disable static library creation
+- Disabling static library creation breaks the build
 
 * Mon Nov 14 2005 Steven Pritchard  0.65-2
 - Rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 01:32:56 -0000	1.6
+++ sources	7 Feb 2006 17:48:27 -0000	1.7
@@ -1 +1,2 @@
-0c924c109b31a632acd7e905fd415c58  cone-0.66.tar.bz2
+967447f88794f6568809c409bdcc8aa4  cone-0.66.20060203.tar.bz2
+3b491ef80708cee46a02eab94c3b5c20  cone-0.66.20060203.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Feb  7 18:03:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  7 Feb 2006 13:03:46 -0500
Subject: rpms/cone/devel cone-0.66.tar.bz2.sig,1.1,NONE
Message-ID: <200602071803.k17I3mHu014843@cvs-int.fedora.redhat.com>

Author: steve

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

Removed Files:
	cone-0.66.tar.bz2.sig 
Log Message:
Remove cone-0.66.tar.bz2.sig.


--- cone-0.66.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb  7 19:16:35 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue,  7 Feb 2006 14:16:35 -0500
Subject: rpms/gnome-blog/devel gnome-blog.spec,1.10,1.11
Message-ID: <200602071917.k17JHGUS017017@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16997

Modified Files:
	gnome-blog.spec 
Log Message:
* Tue Feb  7 2006 Brian Pepple  - 0.8-11
- Remove Utility category from desktop file. (#179827)



Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-blog.spec	15 Jan 2006 19:29:03 -0000	1.10
+++ gnome-blog.spec	7 Feb 2006 19:16:34 -0000	1.11
@@ -4,7 +4,7 @@
 
 Name:		gnome-blog
 Version:	0.8
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	GNOME panel object for posting blog entries
 
 Group:		Applications/Internet
@@ -59,6 +59,7 @@
 desktop-file-install --vendor=fedora			\
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
   --add-category=X-Fedora --add-category=Network	\
+  --remove-category=Utility				\
   %{name}.desktop
 
 # This is a program file and doesn't need to be placed in the library path
@@ -93,6 +94,9 @@
 %ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Tue Feb  7 2006 Brian Pepple  - 0.8-11
+- Remove Utility category from desktop file. (#179827)
+
 * Sun Jan 15 2006 Brian Pepple  - 0.8-10
 - Bump for FC5 rebuild.
 - Added some macros.



From fedora-extras-commits at redhat.com  Tue Feb  7 20:52:25 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue,  7 Feb 2006 15:52:25 -0500
Subject: rpms/fuse/FC-4 fuse.spec,1.2,1.3 fuse-mount.fuse.patch,1.1,NONE
Message-ID: <200602072052.k17KqvFe019526@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	fuse.spec 
Removed Files:
	fuse-mount.fuse.patch 
Log Message:

Ver. 2.5.2




Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fuse.spec	23 Nov 2005 19:32:26 -0000	1.2
+++ fuse.spec	7 Feb 2006 20:52:24 -0000	1.3
@@ -1,17 +1,17 @@
 Name:           fuse
-Version:        2.4.2
-Release:        2%{?dist}
+Version:        2.5.2
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
 License:        GPL
 URL:            http://fuse.sf.net
-Source0:        http://dl.sourceforge.net/sourceforge/fuse/fuse-2.4.2.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/fuse/%{name}-%{version}.tar.gz
 Source1:	fuse-udev.nodes
 Source2:	fuse-makedev.d-fuse
 Source3:	fuse-README.fedora
 
-Patch0:		fuse-mount.fuse.patch
+#Patch0:		fuse-mount.fuse.patch
 Patch1:		fuse-udev_rules.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	kernel >= 2.6.14
@@ -55,7 +55,7 @@
 %setup -q
 #disable device creation during build/install
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
-%patch0 -b .patch0
+#%patch0 -b .patch0
 %patch1 -b .patch1
 cp %{SOURCE3} README.fedora
 
@@ -117,6 +117,10 @@
 %{_includedir}/fuse
 
 %changelog
+* Tue Feb 07 2006 Peter Lemenkov  - 2.5.2-1
+- Update to 2.5.2
+- Dropped fuse-mount.fuse.patch
+
 * Wed Nov 23 2005 Thorsten Leemhuis  - 2.4.2-1
 - Use dist
 


--- fuse-mount.fuse.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb  7 20:52:31 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue,  7 Feb 2006 15:52:31 -0500
Subject: rpms/fuse/devel fuse.spec,1.4,1.5 fuse-mount.fuse.patch,1.3,NONE
Message-ID: <200602072053.k17Kr4wn019529@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	fuse.spec 
Removed Files:
	fuse-mount.fuse.patch 
Log Message:

Ver. 2.5.2




Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse.spec	15 Jan 2006 10:16:27 -0000	1.4
+++ fuse.spec	7 Feb 2006 20:52:31 -0000	1.5
@@ -1,17 +1,17 @@
 Name:           fuse
-Version:        2.4.2
-Release:        2%{?dist}
+Version:        2.5.2
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
 License:        GPL
 URL:            http://fuse.sf.net
-Source0:        http://dl.sourceforge.net/sourceforge/fuse/fuse-2.4.2.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/fuse/%{name}-%{version}.tar.gz
 Source1:	fuse-udev.nodes
 Source2:	fuse-makedev.d-fuse
 Source3:	fuse-README.fedora
 
-Patch0:		fuse-mount.fuse.patch
+#Patch0:		fuse-mount.fuse.patch
 Patch1:		fuse-udev_rules.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	kernel >= 2.6.14
@@ -55,7 +55,7 @@
 %setup -q
 #disable device creation during build/install
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
-%patch0 -b .patch0
+#%patch0 -b .patch0
 %patch1 -b .patch1
 cp %{SOURCE3} README.fedora
 
@@ -117,6 +117,10 @@
 %{_includedir}/fuse
 
 %changelog
+* Tue Feb 07 2006 Peter Lemenkov  - 2.5.2-1
+- Update to 2.5.2
+- Dropped fuse-mount.fuse.patch
+
 * Wed Nov 23 2005 Thorsten Leemhuis  - 2.4.2-1
 - Use dist
 


--- fuse-mount.fuse.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb  7 21:07:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  7 Feb 2006 16:07:38 -0500
Subject: rpms/scorched3d/devel scorched3d-64bit.patch, 1.1,
	1.2 scorched3d.spec, 1.8, 1.9
Message-ID: <200602072108.k17L8BbS021480@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	scorched3d-64bit.patch scorched3d.spec 
Log Message:
more scorched3d wip

scorched3d-64bit.patch:

Index: scorched3d-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-64bit.patch	5 Feb 2006 21:58:44 -0000	1.1
+++ scorched3d-64bit.patch	7 Feb 2006 21:07:38 -0000	1.2
@@ -1,6 +1,6 @@
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/client/ServerBrowser.cpp ./src/client/ServerBrowser.cpp
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/client/ServerBrowser.cpp	2003-10-21 16:58:11.000000000 +0000
-+++ ./src/client/ServerBrowser.cpp	2005-11-01 15:07:15.000000000 +0000
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
+--- scorched.orig/src/client/ServerBrowser.cpp	2003-10-21 18:58:11.000000000 +0200
++++ scorched/src/client/ServerBrowser.cpp	2006-02-06 23:45:56.000000000 +0100
 @@ -50,7 +50,7 @@
  
  int ServerBrowser::threadFunc(void *var)
@@ -10,146 +10,549 @@
  	bool result = false;
  	if (lan) result = instance_->serverList_.fetchLANList();
  	else result = instance_->serverList_.fetchServerList();
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServer.cpp ./src/coms/NetServer.cpp
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServer.cpp	2005-06-10 23:24:31.000000000 +0000
-+++ ./src/coms/NetServer.cpp	2005-11-02 07:07:49.000000000 +0000
-@@ -235,7 +235,7 @@
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
+--- scorched.orig/src/coms/NetServer.cpp	2005-06-11 01:24:31.000000000 +0200
++++ scorched/src/coms/NetServer.cpp	2006-02-07 20:25:49.000000000 +0100
+@@ -33,6 +33,7 @@
+ {
+ 	sockSet_ = SDLNet_AllocSocketSet(1);
+ 	setMutex_ = SDL_CreateMutex();
++	lastId_ = 0;
+ 	SDL_CreateThread(NetServer::threadFunc, (void *) this);
+ }
+ 
+@@ -66,7 +67,7 @@
+ 		{
+ 			NetMessage *message = (delayedMessages_.front()).second;
+ 			delayedMessages_.pop_front();
+-			sendMessage((TCPsocket) message->getDestinationId(), message);
++			sendMessage(message->getDestinationId(), message);
+ 		}
+ 	}
+ 
+@@ -184,27 +185,25 @@
+ bool NetServer::pollDeleted()
+ {
+ 	SDL_LockMutex(setMutex_);
+-	std::list remove;
+-	std::map::iterator itor;
++	std::list remove;
++	std::map::iterator itor;
+ 	for (itor = connections_.begin();
+ 		itor != connections_.end();
+ 		itor++)
+ 	{
+ 		NetServerRead *serverRead = (*itor).second;
+-		TCPsocket socket = (*itor).first;
+ 		if (serverRead->getDisconnect())
+ 		{
+ 			delete serverRead;
+-			remove.push_back(socket);
++			remove.push_back((*itor).first);
+ 		}
+ 	}
+-	std::list::iterator itor2;
++	std::list::iterator itor2;
+ 	for (itor2 = remove.begin();
+ 		itor2 != remove.end();
+ 		itor2++)
+ 	{
+-		TCPsocket socket = (*itor2);
+-		connections_.erase(socket);
++		connections_.erase((*itor2));
+ 	}
+ 	SDL_UnlockMutex(setMutex_);
+ 	return true;
+@@ -212,13 +211,20 @@
+ 
+ void NetServer::addClient(TCPsocket client)
+ {
++	SDL_LockMutex(setMutex_);
++	// Find a free ID
++	unsigned int ID = lastId_ + 1;
++	std::map::iterator itor;
++	while ((itor = connections_.find(ID)) != connections_.end())
++		ID++;
++	lastId_ = ID;
++	
+ 	// Create the thread to read this socket
+-	NetServerRead *serverRead = new NetServerRead(
+-		client, protocol_, &messageHandler_, &checkDeleted_, sentNotification_);
++	NetServerRead *serverRead = new NetServerRead(client, ID, protocol_,
++		&messageHandler_, &checkDeleted_, sentNotification_);
+ 
+ 	// Add this to the collection of sockets (connections)
+-	SDL_LockMutex(setMutex_);
+-	connections_[client] = serverRead;
++	connections_[ID] = serverRead;
+ 	firstDestination_ = (*connections_.begin()).first;
+ 	SDL_UnlockMutex(setMutex_);
+ 
+@@ -228,27 +234,22 @@
+ 
+ void NetServer::disconnectAllClients()
+ {
++	std::map::iterator itor;
+ 	SDL_LockMutex(setMutex_);
+-	std::map::iterator itor;
+ 	for (itor = connections_.begin();
+ 		itor != connections_.end();
  		itor++)
  	{
- 		TCPsocket sock = (*itor).first;
+-		TCPsocket sock = (*itor).first;
 -		disconnectClient((unsigned int) sock);
-+		disconnectClient((unsigned long) sock);
++		disconnectClient((*itor).first);
  	}
  	SDL_UnlockMutex(setMutex_);
  }
-@@ -247,7 +247,7 @@
  
+ void NetServer::disconnectClient(unsigned int dest, bool delayed)
+ {
+-	TCPsocket client = (TCPsocket) dest;
+-	DIALOG_ASSERT(client);
+-
  	NetMessage *message = NetMessagePool::instance()->
  		getFromPool(NetMessage::DisconnectMessage, 
 -				(unsigned int) client,
-+				(unsigned long) client,
- 				getIpAddress(client));
+-				getIpAddress(client));
++				dest, getIpAddress(dest));
  
  	if (delayed)
-@@ -264,7 +264,7 @@
+ 	{
+@@ -258,25 +259,20 @@
+ 	else
+ 	{
+ 		// Add the message to the list of out going
+-		sendMessage(client, message);
++		sendMessage(dest, message);
+ 	}
+ }
  
  void NetServer::sendMessage(NetBuffer &buffer)
  {
 -	sendMessage(buffer, (unsigned int) firstDestination_);
-+	sendMessage(buffer, (unsigned long) firstDestination_);
++	sendMessage(buffer, firstDestination_);
  }
  
- void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest)
-@@ -276,7 +276,7 @@
+-void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest)
+-							
++void NetServer::sendMessage(NetBuffer &buffer, unsigned int destination)
+ {
+-	TCPsocket destination = (TCPsocket) dest;
+-	DIALOG_ASSERT(destination);
+-
  	// Get a new buffer from the pool
  	NetMessage *message = NetMessagePool::instance()->
- 		getFromPool(NetMessage::NoMessage, 
+-		getFromPool(NetMessage::NoMessage, 
 -				(unsigned int) destination,
-+				(unsigned long) destination,
++		getFromPool(NetMessage::NoMessage, destination,
  				getIpAddress(destination));
  
  	// Add message to new buffer
-@@ -304,8 +304,8 @@
+@@ -289,12 +285,12 @@
+ 	sendMessage(destination, message);
+ }
+ 
+-void NetServer::sendMessage(TCPsocket client, NetMessage *message)
++void NetServer::sendMessage(unsigned int dest, NetMessage *message)
+ {
+ 	// Find the client
+ 	SDL_LockMutex(setMutex_);
+-	std::map::iterator itor = 
+-		connections_.find(client);
++	std::map::iterator itor = 
++		connections_.find(dest);
+ 	if (itor != connections_.end()) 
+ 	{
+ 		// Add the message to the list of out going
+@@ -304,10 +300,31 @@
  	else
  	{
  		NetMessagePool::instance()->addToPool(message);
 -		Logger::log( "Unknown sendMessage destination %i",
 -			(int) client);
-+		Logger::log( "Unknown sendMessage destination %li",
-+			(long) client);
++		Logger::log( "Unknown sendMessage destination %u", dest);
++	}
++	SDL_UnlockMutex(setMutex_);
++}
++
++unsigned int NetServer::getIpAddress(unsigned int destination)
++{
++	unsigned int addr = 0;
++
++	SDL_LockMutex(setMutex_);
++	std::map::iterator itor = 
++		connections_.find(destination);
++	if (itor != connections_.end())
++	{
++		NetServerRead *serverRead = (*itor).second;
++		IPaddress *address = SDLNet_TCP_GetPeerAddress(
++					serverRead->getSocket());
++		if (address)
++		{
++			addr = SDLNet_Read32(&address->host);
++		}
  	}
  	SDL_UnlockMutex(setMutex_);
++
++	return addr;
+ }
+ 
+ unsigned int NetServer::getIpAddress(TCPsocket destination)
+Only in scorched/src/coms: NetServer.cpp~
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServer.h scorched/src/coms/NetServer.h
+--- scorched.orig/src/coms/NetServer.h	2005-06-11 01:24:31.000000000 +0200
++++ scorched/src/coms/NetServer.h	2006-02-07 20:26:01.000000000 +0100
+@@ -52,22 +52,24 @@
+ protected:
+ 	NetServerProtocol *protocol_;
+ 	TCPsocket server_;
+-	TCPsocket firstDestination_;
++	unsigned int firstDestination_;
+ 	SDLNet_SocketSet sockSet_;
+-	std::map connections_;
++	std::map connections_;
+ 	std::list > delayedMessages_;
+ 	Clock delayedClock_;
+ 	SDL_mutex *setMutex_;
+ 	NetMessageHandler messageHandler_;
+ 	bool checkDeleted_;
+ 	bool sentNotification_;
++	unsigned int lastId_;
+ 
+ 	static int threadFunc(void *);
+ 
+ 	bool pollIncoming();
+ 	bool pollDeleted();
+ 	void addClient(TCPsocket client);
+-	void sendMessage(TCPsocket client, NetMessage *message);
++	void sendMessage(unsigned int dest, NetMessage *message);
++	unsigned int getIpAddress(unsigned int destination);
+ 
+ private:
+ 
+Only in scorched/src/coms: NetServer.h~
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
+--- scorched.orig/src/coms/NetServerProtocol.cpp	2006-02-06 22:37:12.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.cpp	2006-02-07 20:15:39.000000000 +0100
+@@ -40,7 +40,8 @@
+ {
+ }
+ 
+-bool NetServerScorchedProtocol::sendBuffer(NetBuffer &buffer, TCPsocket socket)
++bool NetServerScorchedProtocol::sendBuffer(NetBuffer &buffer,
++	TCPsocket socket, unsigned int socketId)
+ {
+ 	Uint32 len = buffer.getBufferUsed();
+ 	Uint32 netlen=0;
+@@ -94,7 +95,8 @@
+ 	return true;
  }
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServerProtocol.cpp ./src/coms/NetServerProtocol.cpp
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServerProtocol.cpp	2005-06-13 17:31:06.000000000 +0000
-+++ ./src/coms/NetServerProtocol.cpp	2005-11-02 07:43:20.000000000 +0000
-@@ -125,7 +125,7 @@
+ 
+-NetMessage *NetServerScorchedProtocol::readBuffer(TCPsocket socket)
++NetMessage *NetServerScorchedProtocol::readBuffer(TCPsocket socket,
++	unsigned int socketId)
+ {
+ 	// receive the length of the string message
+ 	char lenbuf[4];
+@@ -125,8 +127,7 @@
  	// allocate the buffer memory
  	NetMessage *buffer = NetMessagePool::instance()->
  		getFromPool(NetMessage::BufferMessage, 
 -				(unsigned int) socket,
-+				(unsigned long) socket,
- 				NetServer::getIpAddress(socket));
+-				NetServer::getIpAddress(socket));
++				socketId, NetServer::getIpAddress(socket));
  	buffer->getBuffer().allocate(len);
  	buffer->getBuffer().setBufferUsed(len);
-@@ -161,7 +161,7 @@
+ 
+@@ -153,7 +154,8 @@
+ {
+ }
+ 
+-bool NetServerCompressedProtocol::sendBuffer(NetBuffer &buffer, TCPsocket socket)
++bool NetServerCompressedProtocol::sendBuffer(NetBuffer &buffer,
++	TCPsocket socket, unsigned int socketId)
+ {
+ 	unsigned long destLen = buffer.getBufferUsed() * 2;
+ 	unsigned long srcLen = buffer.getBufferUsed();
+@@ -161,8 +163,7 @@
  	// Allocate a new buffer
  	NetMessage *newMessage = NetMessagePool::instance()->
  		getFromPool(NetMessage::BufferMessage, 
 -				(unsigned int) socket,
-+				(unsigned long) socket,
- 				NetServer::getIpAddress(socket));
+-				NetServer::getIpAddress(socket));
++				socketId, NetServer::getIpAddress(socket));
  	NetBuffer &newBuffer = newMessage->getBuffer();
  	newBuffer.allocate(destLen);
-@@ -291,7 +291,7 @@
+ 
+@@ -185,7 +186,8 @@
+ 		//Logger::log( "Compressed %i->%i",
+ 		//			buffer.getBufferUsed(), newBuffer.getBufferUsed());
+ 
+-		retVal = NetServerScorchedProtocol::sendBuffer(newBuffer, socket);
++		retVal = NetServerScorchedProtocol::sendBuffer(newBuffer,
++				socket, socketId);
+ 	}
+ 	else
+ 	{
+@@ -197,10 +199,12 @@
+ 	return retVal;
+ }
+ 
+-NetMessage *NetServerCompressedProtocol::readBuffer(TCPsocket socket)
++NetMessage *NetServerCompressedProtocol::readBuffer(TCPsocket socket,
++	unsigned int socketId)
+ {
+ 	// Read the message from the socket
+-	NetMessage *message = NetServerScorchedProtocol::readBuffer(socket);
++	NetMessage *message = NetServerScorchedProtocol::readBuffer(socket,
++				socketId);
+ 	if (message)
+ 	{
+ 		// Get the uncompressed size from the buffer
+@@ -268,7 +272,8 @@
+ {
+ }
+ 
+-bool NetServerHTTPProtocolSend::sendBuffer(NetBuffer &buffer, TCPsocket socket)
++bool NetServerHTTPProtocolSend::sendBuffer(NetBuffer &buffer,
++	TCPsocket socket, unsigned int socketId)
+ {
+ 	Uint32 len = buffer.getBufferUsed();
+ 	
+@@ -286,13 +291,13 @@
+ 	return true;
+ }
+ 
+-NetMessage *NetServerHTTPProtocolSend::readBuffer(TCPsocket socket)
++NetMessage *NetServerHTTPProtocolSend::readBuffer(TCPsocket socket,
++	unsigned int socketId)
+ {
  	// allocate the buffer memory
  	NetMessage *netBuffer = NetMessagePool::instance()->
  		getFromPool(NetMessage::BufferMessage,
 -				(unsigned int) socket,
-+				(unsigned long) socket,
- 				NetServer::getIpAddress(socket));
+-				NetServer::getIpAddress(socket));
++				socketId, NetServer::getIpAddress(socket));
  	netBuffer->getBuffer().reset();
  
-@@ -354,7 +354,7 @@
+ 	// get the string buffer over the socket
+@@ -331,7 +336,8 @@
+ {
+ }
+ 
+-bool NetServerHTTPProtocolRecv::sendBuffer(NetBuffer &buffer, TCPsocket socket)
++bool NetServerHTTPProtocolRecv::sendBuffer(NetBuffer &buffer,
++	TCPsocket socket, unsigned int socketId)
+ {
+ 	Uint32 len = buffer.getBufferUsed();
+ 	
+@@ -349,13 +355,13 @@
+ 	return true;
+ }
+ 
+-NetMessage *NetServerHTTPProtocolRecv::readBuffer(TCPsocket socket)
++NetMessage *NetServerHTTPProtocolRecv::readBuffer(TCPsocket socket,
++	unsigned int socketId)
+ {
  	// allocate the buffer memory
  	NetMessage *netBuffer = NetMessagePool::instance()->
  		getFromPool(NetMessage::BufferMessage,
 -				(unsigned int) socket,
-+				(unsigned long) socket,
- 				NetServer::getIpAddress(socket));
+-				NetServer::getIpAddress(socket));
++				socketId, NetServer::getIpAddress(socket));
  	netBuffer->getBuffer().reset();
  
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServerRead.cpp ./src/coms/NetServerRead.cpp
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/coms/NetServerRead.cpp	2005-06-10 23:24:31.000000000 +0000
-+++ ./src/coms/NetServerRead.cpp	2005-11-02 07:44:10.000000000 +0000
-@@ -64,7 +64,7 @@
+ 	// get the string buffer over the socket
+Only in scorched/src/coms: NetServerProtocol.cpp~
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerProtocol.h scorched/src/coms/NetServerProtocol.h
+--- scorched.orig/src/coms/NetServerProtocol.h	2005-06-08 19:29:38.000000000 +0200
++++ scorched/src/coms/NetServerProtocol.h	2006-02-07 20:14:35.000000000 +0100
+@@ -29,8 +29,10 @@
+ 	NetServerProtocol();
+ 	virtual ~NetServerProtocol();
+ 
+-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket) = 0;
+-	virtual NetMessage *readBuffer(TCPsocket socket) = 0;
++	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
++		unsigned int socketId) = 0;
++	virtual NetMessage *readBuffer(TCPsocket socket,
++		unsigned int socketId) = 0;
+ };
+ 
+ class NetServerScorchedProtocol : public NetServerProtocol
+@@ -39,8 +41,10 @@
+ 	NetServerScorchedProtocol();
+ 	virtual ~NetServerScorchedProtocol();
+ 
+-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket);
+-	virtual NetMessage *readBuffer(TCPsocket socket);
++	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
++		unsigned int socketId);
++	virtual NetMessage *readBuffer(TCPsocket socket,
++		unsigned int socketId);
+ };
+ 
+ class NetServerCompressedProtocol : public NetServerScorchedProtocol
+@@ -49,8 +53,10 @@
+ 	NetServerCompressedProtocol();
+ 	virtual ~NetServerCompressedProtocol();
+ 
+-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket);
+-	virtual NetMessage *readBuffer(TCPsocket socket);
++	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
++		unsigned int socketId);
++	virtual NetMessage *readBuffer(TCPsocket socket,
++		unsigned int socketId);
+ };
+ 
+ class NetServerHTTPProtocolSend : public NetServerProtocol
+@@ -59,8 +65,10 @@
+ 	NetServerHTTPProtocolSend();
+ 	virtual ~NetServerHTTPProtocolSend();
+ 
+-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket);
+-	virtual NetMessage *readBuffer(TCPsocket socket);
++	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
++		unsigned int socketId);
++	virtual NetMessage *readBuffer(TCPsocket socket,
++		unsigned int socketId);
+ };
+ 
+ class NetServerHTTPProtocolRecv : public NetServerProtocol
+@@ -69,8 +77,10 @@
+ 	NetServerHTTPProtocolRecv();
+ 	virtual ~NetServerHTTPProtocolRecv();
+ 
+-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket);
+-	virtual NetMessage *readBuffer(TCPsocket socket);
++	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
++		unsigned int socketId);
++	virtual NetMessage *readBuffer(TCPsocket socket,
++		unsigned int socketId);
+ };
+ 
+ #endif
+Only in scorched/src/coms: NetServerProtocol.h~
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
+--- scorched.orig/src/coms/NetServerRead.cpp	2005-06-11 01:24:31.000000000 +0200
++++ scorched/src/coms/NetServerRead.cpp	2006-02-07 20:19:01.000000000 +0100
+@@ -26,11 +26,12 @@
+ #include 
+ 
+ NetServerRead::NetServerRead(TCPsocket socket,
++							 unsigned int socketId,
+ 							 NetServerProtocol *protocol,
+ 							 NetMessageHandler *messageHandler,
+ 							 bool *checkDeleted,
+ 							 bool sentNotification) : 
+-	socket_(socket), sockSet_(0), protocol_(protocol), 
++	socket_(socket), socketId_(socketId), sockSet_(0), protocol_(protocol), 
+ 	outgoingMessagesMutex_(0), checkDeleted_(checkDeleted),
+ 	disconnect_(false), messageHandler_(messageHandler),
+ 	sentDisconnect_(false), startCount_(0),
+@@ -64,8 +65,7 @@
  	// Send the player connected notification
  	NetMessage *message = NetMessagePool::instance()->
  		getFromPool(NetMessage::ConnectMessage, 
 -		(unsigned int) socket_,
-+		(unsigned long) socket_,
- 		NetServer::getIpAddress(socket_));
+-		NetServer::getIpAddress(socket_));
++		socketId_, NetServer::getIpAddress(socket_));
  	messageHandler_->addMessage(message);
  
-@@ -96,7 +96,7 @@
+ 	recvThread_ = SDL_CreateThread(
+@@ -96,8 +96,7 @@
  		sentDisconnect_ = true;
  		NetMessage *message = NetMessagePool::instance()->
  			getFromPool(NetMessage::DisconnectMessage, 
 -				(unsigned int) socket_,
-+				(unsigned long) socket_,
- 				NetServer::getIpAddress(socket_));
+-				NetServer::getIpAddress(socket_));
++				socketId_, NetServer::getIpAddress(socket_));
  		messageHandler_->addMessage(message);
  	}
-@@ -191,7 +191,7 @@
+ 	SDL_UnlockMutex(outgoingMessagesMutex_);
+@@ -189,9 +188,9 @@
+ 		if (timeDiff > 15.0f)
+ 		{
  			Logger::log( 
- 				"Warning: %s net loop took %.2f seconds, client %i", 
+-				"Warning: %s net loop took %.2f seconds, client %i", 
++				"Warning: %s net loop took %.2f seconds, client %u", 
  				(send?"Send":"Recv"),
 -				timeDiff, (unsigned int) socket_);
-+				timeDiff, (unsigned long) socket_);
++				timeDiff, socketId_);
  		}
  	}
  
-@@ -201,7 +201,7 @@
+@@ -201,8 +200,7 @@
  		sentDisconnect_ = true;
  		NetMessage *message = NetMessagePool::instance()->
  			getFromPool(NetMessage::DisconnectMessage, 
 -				(unsigned int) socket_,
-+				(unsigned long) socket_,
- 				NetServer::getIpAddress(socket_));
+-				NetServer::getIpAddress(socket_));
++				socketId_, NetServer::getIpAddress(socket_));
  		messageHandler_->addMessage(message);
  	}
+ 	SDL_UnlockMutex(outgoingMessagesMutex_);
+@@ -220,7 +218,8 @@
+ 
+ 	if(SDLNet_SocketReady(socket_))
+ 	{
+-		NetMessage *message = protocol_->readBuffer(socket_);
++		NetMessage *message = protocol_->readBuffer(socket_,
++					socketId_);
+ 		if (!message)
+ 		{
+ 			Logger::log( "Client socket has been closed.");
+@@ -263,7 +262,8 @@
+ 		}
+ 		else
+ 		{
+-			if (!protocol_->sendBuffer(message->getBuffer(), socket_))
++			if (!protocol_->sendBuffer(message->getBuffer(),
++				socket_, socketId_))
+ 			{
+ 				Logger::log( "Failed to send message to client");
+ 				result = false;
 @@ -276,7 +276,7 @@
  		{
  			NetMessage *notification = NetMessagePool::instance()->
  				getFromPool(NetMessage::SentMessage,
 -					(unsigned int) socket_,
-+					(unsigned long) socket_,
++					socketId_,
  					NetServer::getIpAddress(socket_));
  			messageHandler_->addMessage(notification);
  		}
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/dialogs/HelpButtonDialog.cpp ./src/dialogs/HelpButtonDialog.cpp
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/dialogs/HelpButtonDialog.cpp	2005-09-18 09:59:33.000000000 +0000
-+++ ./src/dialogs/HelpButtonDialog.cpp	2005-11-01 15:07:15.000000000 +0000
+Only in scorched/src/coms: NetServerRead.cpp~
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerRead.h scorched/src/coms/NetServerRead.h
+--- scorched.orig/src/coms/NetServerRead.h	2005-06-11 01:24:31.000000000 +0200
++++ scorched/src/coms/NetServerRead.h	2006-02-07 19:52:32.000000000 +0100
+@@ -28,6 +28,7 @@
+ {
+ public:
+ 	NetServerRead(TCPsocket socket,
++		unsigned int socketId,
+ 		NetServerProtocol *protocol,
+ 		NetMessageHandler *messageHandler,
+ 		bool *checkDeleted,
+@@ -37,12 +38,14 @@
+ 	void start();
+ 	bool getDisconnect();
+ 	void addMessage(NetMessage *message);
++	TCPsocket getSocket() { return socket_; }
+ 
+ protected:
+ 	bool *checkDeleted_;
+ 	bool disconnect_, sentDisconnect_;
+ 	bool sentNotification_;
+ 	TCPsocket socket_;
++	unsigned int socketId_;
+ 	SDLNet_SocketSet sockSet_;
+ 	NetServerProtocol *protocol_;
+ 	NetMessageHandler *messageHandler_;
+Only in scorched/src/coms: NetServerRead.h~
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
+--- scorched.orig/src/dialogs/HelpButtonDialog.cpp	2006-02-06 22:37:12.000000000 +0100
++++ scorched/src/dialogs/HelpButtonDialog.cpp	2006-02-06 23:45:56.000000000 +0100
 @@ -160,7 +160,7 @@
  
  void HelpButtonDialog::itemSelected(GLWSelectorEntry *entry, int position)
@@ -159,15 +562,16 @@
  	if (data != -1)
  	{
  		int volume = int(float(data) * 12.8f);
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/engine/ScorchedCollisionHandler.cpp ./src/engine/ScorchedCollisionHandler.cpp
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/engine/ScorchedCollisionHandler.cpp	2005-06-08 17:29:38.000000000 +0000
-+++ ./src/engine/ScorchedCollisionHandler.cpp	2005-11-01 19:47:08.000000000 +0000
+Only in scorched/src/dialogs: HelpButtonDialog.cpp.64bit
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
+--- scorched.orig/src/engine/ScorchedCollisionHandler.cpp	2005-06-08 19:29:38.000000000 +0200
++++ scorched/src/engine/ScorchedCollisionHandler.cpp	2006-02-06 23:45:56.000000000 +0100
 @@ -93,7 +93,7 @@
  	}
  
  	ShotBounce *particle = (ShotBounce *) bounceInfo->data;
 -	unsigned int id = (unsigned int) otherInfo->data;
-+	unsigned long id = (unsigned long) otherInfo->data;
++	unsigned int id = (unsigned long) otherInfo->data;
  
  	// only collide with the ground, walls or landscape,
  	// or iteself
@@ -176,13 +580,14 @@
  	}
  
 -	unsigned int id = (unsigned int) otherInfo->data;
-+	unsigned long id = (unsigned long) otherInfo->data;
++	unsigned int id = (unsigned long) otherInfo->data;
  	ShotProjectile *shot = (ShotProjectile *) particleInfo->data;
  	shot->incLandedCounter();
  	Vector particlePositionV(
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/ode/config.h ./src/ode/config.h
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/ode/config.h	2004-11-02 09:20:35.000000000 +0000
-+++ ./src/ode/config.h	2005-11-01 15:07:15.000000000 +0000
+Only in scorched/src/engine: ScorchedCollisionHandler.cpp.64bit
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/ode/config.h scorched/src/ode/config.h
+--- scorched.orig/src/ode/config.h	2004-11-02 10:20:35.000000000 +0100
++++ scorched/src/ode/config.h	2006-02-06 23:45:56.000000000 +0100
 @@ -81,7 +81,7 @@
  /* an integer type that we can safely cast a pointer to and from without
   * loss of bits.
@@ -192,9 +597,9 @@
  
  
  /* if we're compiling on a pentium, we may need to know the clock rate so
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/scorched/SettingsDialog.cpp ./src/scorched/SettingsDialog.cpp
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/scorched/SettingsDialog.cpp	2005-09-22 15:14:28.000000000 +0000
-+++ ./src/scorched/SettingsDialog.cpp	2005-11-02 07:48:05.000000000 +0000
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
+--- scorched.orig/src/scorched/SettingsDialog.cpp	2006-02-06 22:37:12.000000000 +0100
++++ scorched/src/scorched/SettingsDialog.cpp	2006-02-06 23:45:56.000000000 +0100
 @@ -748,44 +748,44 @@
  
  	// Env
@@ -263,9 +668,9 @@
  			SettingsMain::IDC_TEAMBALLANCE_CTRL->GetClientData(
  				SettingsMain::IDC_TEAMBALLANCE_CTRL->GetSelection()));			
  		context_.setTeams((int) SettingsMain::IDC_TEAMS_CTRL->GetSelection() + 1);
-diff -urN ../tmp-orig/scorched3d-39.1+cvs20050929/src/tankgraph/GLWTankTip.cpp ./src/tankgraph/GLWTankTip.cpp
---- ../tmp-orig/scorched3d-39.1+cvs20050929/src/tankgraph/GLWTankTip.cpp	2005-06-11 16:53:41.000000000 +0000
-+++ ./src/tankgraph/GLWTankTip.cpp	2005-11-01 15:07:15.000000000 +0000
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
+--- scorched.orig/src/tankgraph/GLWTankTip.cpp	2005-06-11 18:53:41.000000000 +0200
++++ scorched/src/tankgraph/GLWTankTip.cpp	2006-02-06 23:45:56.000000000 +0100
 @@ -66,7 +66,7 @@
  
  void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position)


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scorched3d.spec	6 Feb 2006 15:01:40 -0000	1.8
+++ scorched3d.spec	7 Feb 2006 21:07:38 -0000	1.9
@@ -55,9 +55,9 @@
 %patch1 -p1 -z .syslibs
 %patch2 -p0 -z .aclocal18
 %patch3 -p1 -z .gcc41
-%patch4 -p0 -z .64bit
+%patch4 -p1 -z .64bit
 %patch5 -p1 -z .openal
-%patch6 -p1 -z .help
+#%patch6 -p1 -z .help
 tar xvfz %{SOURCE2}
 . autogen.sh
 



From fedora-extras-commits at redhat.com  Tue Feb  7 21:11:16 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue,  7 Feb 2006 16:11:16 -0500
Subject: rpms/fuse import.log,1.3,1.4
Message-ID: <200602072111.k17LBml0021552@cvs-int.fedora.redhat.com>

Author: peter

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	13 Jan 2006 00:49:44 -0000	1.3
+++ import.log	7 Feb 2006 21:11:16 -0000	1.4
@@ -1,2 +1,3 @@
 fuse-2_4_2-1:HEAD:fuse-2.4.2-1.src.rpm:1132774168
 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



From fedora-extras-commits at redhat.com  Tue Feb  7 21:11:24 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue,  7 Feb 2006 16:11:24 -0500
Subject: rpms/fuse/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200602072111.k17LBuDe021556@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	.cvsignore sources 
Log Message:
auto-import fuse-2.5.2-1 on branch devel from fuse-2.5.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jan 2006 10:13:21 -0000	1.4
+++ .cvsignore	7 Feb 2006 21:11:24 -0000	1.5
@@ -1 +1 @@
-fuse-2.4.2.tar.gz
+fuse-2.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2006 10:13:22 -0000	1.4
+++ sources	7 Feb 2006 21:11:24 -0000	1.5
@@ -1 +1 @@
-6e3d9a580c45ddf4a06558c135c158c2  fuse-2.4.2.tar.gz
+ea565debe6c7486963bef05c45c50361  fuse-2.5.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb  7 22:17:47 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue,  7 Feb 2006 17:17:47 -0500
Subject: rpms/perl-Font-TTF import.log,1.2,1.3
Message-ID: <200602072218.k17MIKYU024179@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Font-TTF
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24152

Modified Files:
	import.log 
Log Message:
auto-import perl-Font-TTF-0.37-3.fc4 on branch FC-4 from perl-Font-TTF-0.37-3.fc4.src.rpm
initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Font-TTF/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	5 Feb 2006 18:30:03 -0000	1.2
+++ import.log	7 Feb 2006 22:17:46 -0000	1.3
@@ -1 +1,2 @@
 perl-Font-TTF-0_37-3_fc5:HEAD:perl-Font-TTF-0.37-3.fc5.src.rpm:1139164179
+perl-Font-TTF-0_37-3_fc4:FC-4:perl-Font-TTF-0.37-3.fc4.src.rpm:1139350656



From fedora-extras-commits at redhat.com  Tue Feb  7 23:09:20 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue,  7 Feb 2006 18:09:20 -0500
Subject: rpms/rssowl/devel rssowl.script,1.2,1.3 rssowl.spec,1.2,1.3
Message-ID: <200602072309.k17N9t5s026118@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	rssowl.script rssowl.spec 
Log Message:
Update to -9 release.  Many tweaks.



Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl.script	4 Feb 2006 13:37:54 -0000	1.2
+++ rssowl.script	7 Feb 2006 23:09:11 -0000	1.3
@@ -5,9 +5,9 @@
 
 # This makes the embedded browser work.
 if [ -z "$MOZILLA_FIVE_HOME" ]; then
-  XPCOM=$(ls -t /usr/lib/mozilla-*/libxpcom.so|head -n1)
+  XPCOM=$(ls -t /usr/lib64/mozilla-*/libxpcom.so|head -n1)
   export MOZILLA_FIVE_HOME=$(dirname $XPCOM)
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib64/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl.spec	4 Feb 2006 13:37:54 -0000	1.2
+++ rssowl.spec	7 Feb 2006 23:09:11 -0000	1.3
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2
-%define release 8%{?dist}
+%define release 9%{?dist}
 %define jdk     java
 
 Name:           %name
@@ -33,21 +33,21 @@
 Requires(postun): java-gcj-compat >= 1.0.31
 Requires: 	itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
 Requires:  	libgconf-java
+BuildRequires:    desktop-file-utils
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
 RSSOwl is a RSS / RDF / Atom Newsreader written in Java using SWT as
 fast graphic library. Read News in a tabfolder, save favorites in
 categories, Export to PDF / RTF / HTML / OPML, Import Feeds from OPML,
-perform fulltext-search, use the integrated browser. Please contact
-bpasero at rssowl.org if you have any questions or problems regarding
-this version.
+perform fulltext-search, use the integrated browser.
 
 %description -l de
 RSSOwl ist ein RSS / RDF / Atom Newsreader in Java mit SWT als
 GUI-Bibliothek. Einige der Features sind Export von Nachrichten nach
 PDF / RTF / HTML, Import / Export mit OPML, Volltextsuche und der
-integrierte Browser. Bei Fragen oder Problemen mit dieser Version
-bitte an bpasero at rssowl.org schreiben.
+integrierte Browser.
 
 %prep
 %setup -q -n %{name}_1_2_src_clean
@@ -87,7 +87,10 @@
 install -m 644 img/32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/rssowl.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor fedora 			\
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	%{SOURCE2}
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
@@ -103,9 +106,23 @@
 
 aot-compile-rpm
 
-%post -p %{_bindir}/rebuild-gcj-db
-
-%postun -p %{_bindir}/rebuild-gcj-db
+%post 
+%{_bindir}/rebuild-gcj-db
+update-desktop-database %{_datadir}/application
+# update icon themes
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+%postun 
+%{_bindir}/rebuild-gcj-db
+update-desktop-database %{_datadir}/applications
+# update icon themes
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,9 +138,13 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
-* Sat Feb  4 2006 Anthony Green  - 1.2-8
+* Tue Feb  7 2006 Anthony Green  - 1.2-9
 - Update eclipse-platform requirement in spec file and eclipse swt and 
   runtime references in rssowl.script.
+- Install .desktop file propertly.
+- Run update-desktop-database and gtk-update-icon-cache in post and postun.
+- Add desktop-file-utils dependencies.
+- Tweak description.
 
 * Mon Jan 16 2006 Anthony Green  1.2-7
 - Word-wrapped descriptions.



From fedora-extras-commits at redhat.com  Tue Feb  7 23:49:19 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue,  7 Feb 2006 18:49:19 -0500
Subject: rpms/rssowl/devel rssowl.spec,1.3,1.4
Message-ID: <200602072349.k17Nnpa6029291@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	rssowl.spec 
Log Message:
Update to -10.  Fix swt jar file reference.



Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rssowl.spec	7 Feb 2006 23:09:11 -0000	1.3
+++ rssowl.spec	7 Feb 2006 23:49:18 -0000	1.4
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2
-%define release 9%{?dist}
+%define release 10%{?dist}
 %define jdk     java
 
 Name:           %name
@@ -61,7 +61,7 @@
 rm doc/mpl-v11.txt
 
 %build
-build-jar-repository lib swt-gtk-3.1.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
+build-jar-repository lib swt-gtk-3.1.1 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
 ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar lib
 ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar lib
 cd src
@@ -138,6 +138,9 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Tue Feb  7 2006 Anthony Green  - 1.2-10
+- Fix swt jar reference in build-jar-repository.
+
 * Tue Feb  7 2006 Anthony Green  - 1.2-9
 - Update eclipse-platform requirement in spec file and eclipse swt and 
   runtime references in rssowl.script.



From fedora-extras-commits at redhat.com  Wed Feb  8 02:19:36 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue,  7 Feb 2006 21:19:36 -0500
Subject: rpms/xpilot-ng/FC-4 xpilot-ng.spec,1.1,1.2
Message-ID: <200602080220.k182K86P002790@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/xpilot-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2763

Modified Files:
	xpilot-ng.spec 
Log Message:
Changes to spec file for FC-4.




Index: xpilot-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpilot-ng.spec	6 Feb 2006 17:30:58 -0000	1.1
+++ xpilot-ng.spec	8 Feb 2006 02:19:35 -0000	1.2
@@ -15,7 +15,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  expat-devel SDL_ttf-devel SDL_image-devel zlib-devel
 # The following BR are not needed for FC-4
-BuildRequires:  libXt-devel mesa-libGLU-devel libXxf86misc-devel
+#BuildRequires:  libXt-devel mesa-libGLU-devel libXxf86misc-devel
 
 %description
 A highly addictive, infinitely configurable multiplayer space
@@ -110,11 +110,11 @@
 %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz
 %doc README COPYING
 #The following two entries need to be removed with FC-4
-%ghost %{_datadir}/%{name}/mapconvert.pyc
-%ghost %{_datadir}/%{name}/mapconvert.pyo
+#%ghost %{_datadir}/%{name}/mapconvert.pyc
+#%ghost %{_datadir}/%{name}/mapconvert.pyo
 
 %changelog
-* Mon Feb 6 2006 Wart  4.7.2-5
+* Mon Feb 6 2006 Wart  4.7.2-4
 - Don't make duplicates of the doc files for the subpackage.
 - Use version macro is source path
 - Preserve timestamps when installing icons.



From fedora-extras-commits at redhat.com  Wed Feb  8 04:19:42 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue,  7 Feb 2006 23:19:42 -0500
Subject: rpms/cacti/FC-3 cacti.spec,1.1,1.2
Message-ID: <200602080420.k184KEKB006779@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Log Message:
Added dist tag



Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-3/cacti.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti.spec	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti.spec	8 Feb 2006 04:19:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6h
-Release: 4
+Release: 4%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System



From fedora-extras-commits at redhat.com  Wed Feb  8 04:19:48 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue,  7 Feb 2006 23:19:48 -0500
Subject: rpms/cacti/FC-4 cacti.spec,1.1,1.2
Message-ID: <200602080420.k184KLaX006782@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Log Message:
Added dist tag



Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-4/cacti.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti.spec	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti.spec	8 Feb 2006 04:19:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6h
-Release: 4
+Release: 4%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System



From fedora-extras-commits at redhat.com  Wed Feb  8 04:30:58 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Tue,  7 Feb 2006 23:30:58 -0500
Subject: rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors.spec,1.4,1.5
Message-ID: <200602080431.k184VUe9006895@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-sensors/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6875

Modified Files:
	gnome-applet-sensors.spec 
Log Message:
* Tue Feb 06 2006 Aaron Kurtz  - 1.4-3
- make that lm_sensors



Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/gnome-applet-sensors.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-applet-sensors.spec	7 Feb 2006 05:01:25 -0000	1.4
+++ gnome-applet-sensors.spec	8 Feb 2006 04:30:58 -0000	1.5
@@ -12,7 +12,7 @@
 
 BuildRequires: gettext
 BuildRequires: gnome-panel-devel >= 2.8
-Requires: lm-sensors
+Requires: lm_sensors
 
 %description
 GNOME Sensors Applet is an applet for the GNOME Panel to display readings
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Feb 06 2006 Aaron Kurtz  - 1.4-3
+- make that lm_sensors
+
 * Mon Feb 06 2006 Aaron Kurtz  - 1.4-2
 - add lm-sensors requires
 



From fedora-extras-commits at redhat.com  Wed Feb  8 04:32:38 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Tue,  7 Feb 2006 23:32:38 -0500
Subject: rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors.spec,1.5,1.6
Message-ID: <200602080433.k184XAZZ006962@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-sensors/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6932

Modified Files:
	gnome-applet-sensors.spec 
Log Message:
* Tue Feb 06 2006 Aaron Kurtz  - 1.4-3
- make that lm_sensors



Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/gnome-applet-sensors.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-applet-sensors.spec	8 Feb 2006 04:30:58 -0000	1.5
+++ gnome-applet-sensors.spec	8 Feb 2006 04:32:38 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gnome-applet-sensors
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 
 Group:          User Interface/Desktops



From fedora-extras-commits at redhat.com  Wed Feb  8 06:17:39 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed,  8 Feb 2006 01:17:39 -0500
Subject: rpms/linphone/devel linphone.spec,1.17,1.18
Message-ID: <200602080618.k186IB29010801@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	linphone.spec 
Log Message:
Added version for speex-devel BR (#179879)


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linphone.spec	25 Jan 2006 02:08:00 -0000	1.17
+++ linphone.spec	8 Feb 2006 06:17:38 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires:  libosip2-devel speex-devel gettext desktop-file-utils
+BuildRequires:  libosip2-devel speex-devel >= 1.0.5  gettext desktop-file-utils
 BuildRequires:  ortp-devel >= 0.7.1
 
 %description
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Feb  8 2006 Ignacio Vazquez-Abrams  1.2.0-1
+- Added version for speex-devel BR (#179879)
+
 * Tue Jan 24 2006 Ignacio Vazquez-Abrams  1.2.0-2
 - Fixed selecting entry from address book (#177189)
 



From fedora-extras-commits at redhat.com  Wed Feb  8 06:41:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  8 Feb 2006 01:41:20 -0500
Subject: rpms/koffice/devel koffice.spec,1.28,1.29
Message-ID: <200602080641.k186fqAv010926@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Log Message:
- exclude mimelnk/image/x-raw.desktop (#180335)



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- koffice.spec	6 Feb 2006 13:41:53 -0000	1.28
+++ koffice.spec	8 Feb 2006 06:41:20 -0000	1.29
@@ -523,7 +523,6 @@
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
 %{_datadir}/apps/kross
-%{_datadir}/mimelnk/image/x-raw.desktop
 # add writeup here for now
 %{_bindir}/writeup
 %{_libdir}/kde3/libwriteup_part.*
@@ -532,6 +531,7 @@
 %{_datadir}/applications/fedora-writeup.desktop
 %{_datadir}/apps/writeup
 %{_datadir}/services/writeuppart.desktop
+%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*
@@ -912,6 +912,10 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Wed Feb 08 2006 Andreas Bierfert 
+1.4.90-3
+- exclude mimelnk/image/x-raw.desktop (#180335)
+
 * Mon Feb 06 2006 Andreas Bierfert 
 1.4.90-2
 - enable ruby again (bug #179835)



From fedora-extras-commits at redhat.com  Wed Feb  8 06:42:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  8 Feb 2006 01:42:25 -0500
Subject: rpms/koffice/devel koffice.spec,1.29,1.30
Message-ID: <200602080642.k186gwic010950@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Log Message:
- bump release



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- koffice.spec	8 Feb 2006 06:41:20 -0000	1.29
+++ koffice.spec	8 Feb 2006 06:42:25 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.4.90
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity



From fedora-extras-commits at redhat.com  Wed Feb  8 07:20:27 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 02:20:27 -0500
Subject: rpms/perl-Tie-EncryptedHash - New directory
Message-ID: <200602080720.k187KTA1013020@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Tie-EncryptedHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13005/perl-Tie-EncryptedHash

Log Message:
Directory /cvs/extras/rpms/perl-Tie-EncryptedHash added to the repository




From fedora-extras-commits at redhat.com  Wed Feb  8 07:20:33 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 02:20:33 -0500
Subject: rpms/perl-Tie-EncryptedHash/devel - New directory
Message-ID: <200602080720.k187KZP6013035@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Tie-EncryptedHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13005/perl-Tie-EncryptedHash/devel

Log Message:
Directory /cvs/extras/rpms/perl-Tie-EncryptedHash/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Feb  8 07:21:04 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 02:21:04 -0500
Subject: rpms/perl-Tie-EncryptedHash Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602080721.k187L6U2013069@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Tie-EncryptedHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13057

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Tie-EncryptedHash


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb  8 07:21:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 02:21:10 -0500
Subject: rpms/perl-Tie-EncryptedHash/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200602080721.k187LC9w013089@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Tie-EncryptedHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13057/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Tie-EncryptedHash


--- NEW 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 Feb  8 07:23:04 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 02:23:04 -0500
Subject: rpms/perl-Tie-EncryptedHash import.log,1.1,1.2
Message-ID: <200602080723.k187Na3a013308@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Tie-EncryptedHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13225

Modified Files:
	import.log 
Log Message:
auto-import perl-Tie-EncryptedHash-1.21-1 on branch devel from perl-Tie-EncryptedHash-1.21-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-EncryptedHash/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Feb 2006 07:21:04 -0000	1.1
+++ import.log	8 Feb 2006 07:23:04 -0000	1.2
@@ -0,0 +1 @@
+perl-Tie-EncryptedHash-1_21-1:HEAD:perl-Tie-EncryptedHash-1.21-1.src.rpm:1139383323



From fedora-extras-commits at redhat.com  Wed Feb  8 07:23:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 02:23:10 -0500
Subject: rpms/perl-Tie-EncryptedHash/devel perl-Tie-EncryptedHash.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602080723.k187NgRK013318@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Tie-EncryptedHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13225/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Tie-EncryptedHash.spec 
Log Message:
auto-import perl-Tie-EncryptedHash-1.21-1 on branch devel from perl-Tie-EncryptedHash-1.21-1.src.rpm


--- NEW FILE perl-Tie-EncryptedHash.spec ---
Summary:	Hashes (and objects based on hashes) with encrypting fields
Name:		perl-Tie-EncryptedHash
Version:	1.21
Release:	1%{?dist}
License:	Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Tie-EncryptedHash/
Source0:	http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Tie-EncryptedHash-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(Crypt::CBC)
BuildRequires:	perl(Crypt::Blowfish)
BuildRequires:	perl(Crypt::DES)

%description
Tie::EncryptedHash augments Perl hash semantics to build secure, encrypting
containers of data. Tie::EncryptedHash introduces special hash fields that are
coupled with encrypt/decrypt routines to encrypt assignments at STORE() and
decrypt retrievals at FETCH(). By design, encrypting fields are associated with
keys that begin in single underscore. The remaining keyspace is used for
accessing normal hash fields, which are retained without modification.

While the password is set, a Tie::EncryptedHash behaves exactly like a standard
Perl hash. This is its transparent mode of access. Encrypting and normal fields
are identical in this mode. When password is deleted, encrypting fields are
accessible only as ciphertext. This is Tie::EncryptedHash's opaque mode of
access, optimized for serialization.

Encryption is done with Crypt::CBC(3), which encrypts in the cipher block
chaining mode with Blowfish, DES or IDEA. Tie::EncryptedHash uses Blowfish by
default, but can be instructed to employ any cipher supported by Crypt::CBC(3).

%prep
%setup -q -n Tie-EncryptedHash-%{version}
%{__sed} -i -e '/^#! *\/usr\/bin\/perl /d' lib/Tie/EncryptedHash.pm

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

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README.html TODO
%{perl_vendorlib}/Tie/
%{_mandir}/man3/Tie::EncryptedHash.3pm*

%changelog
* Tue Dec  6 2005 Paul Howarth  1.21-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-EncryptedHash/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Feb 2006 07:21:10 -0000	1.1
+++ .cvsignore	8 Feb 2006 07:23:09 -0000	1.2
@@ -0,0 +1 @@
+Tie-EncryptedHash-1.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-EncryptedHash/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Feb 2006 07:21:10 -0000	1.1
+++ sources	8 Feb 2006 07:23:09 -0000	1.2
@@ -0,0 +1 @@
+5a85bd78c74ef52aeff6c70836f9d3bf  Tie-EncryptedHash-1.21.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 07:28:40 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 02:28:40 -0500
Subject: owners owners.list,1.618,1.619
Message-ID: <200602080729.k187TDOt013986@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	owners.list 
Log Message:
Add perl-Tie-EncryptedHash



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -r1.618 -r1.619
--- owners.list	7 Feb 2006 12:22:57 -0000	1.618
+++ owners.list	8 Feb 2006 07:28:40 -0000	1.619
@@ -977,6 +977,7 @@
 Fedora Extras|perl-Text-Wrapper|Simple word wrapping perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Tie-DBI|Tie hashes to DBI relational databases|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Tie-EncryptedHash|Hashes (and objects based on hashes) with encrypting fields|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tie-IxHash|Ordered associative arrays for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Time-modules|Perl modules for parsing dates and times|kaboom at oobleck.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Time-Piece-MySQL|MySQL-specific methods for Time::Piece|chris at chrisgrau.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Feb  8 10:31:07 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed,  8 Feb 2006 05:31:07 -0500
Subject: rpms/yumex/FC-4 .cvsignore, 1.9, 1.10 sources, 1.11, 1.12 yumex.spec,
	1.11, 1.12
Message-ID: <200602081031.k18AVetU025166@cvs-int.fedora.redhat.com>

Author: timlau

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

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.44-3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Dec 2005 13:40:44 -0000	1.9
+++ .cvsignore	8 Feb 2006 10:31:06 -0000	1.10
@@ -1 +1 @@
-yumex-0.44-1.tar.gz
+yumex-0.44-3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Dec 2005 13:40:44 -0000	1.11
+++ sources	8 Feb 2006 10:31:06 -0000	1.12
@@ -1 +1 @@
-e7812008ac74652f58f8b87691f44f20  yumex-0.44-1.tar.gz
+b8952523c434814fa40426f6b73dbdcd  yumex-0.44-3.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yumex.spec	16 Dec 2005 13:40:44 -0000	1.11
+++ yumex.spec	8 Feb 2006 10:31:06 -0000	1.12
@@ -1,8 +1,8 @@
-%define   build_v 1
+%define   build_v 3
 
 Name:     yumex
 Version:  0.44
-Release:  1.0%{?dist}
+Release:  3.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,10 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* 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
 * 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 Feb  8 11:06:17 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed,  8 Feb 2006 06:06:17 -0500
Subject: rpms/yumex/FC-4 .cvsignore, 1.10, 1.11 sources, 1.12,
	1.13 yumex.spec, 1.12, 1.13
Message-ID: <200602081106.k18B6o5V027103@cvs-int.fedora.redhat.com>

Author: timlau

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

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.44-4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Feb 2006 10:31:06 -0000	1.10
+++ .cvsignore	8 Feb 2006 11:06:16 -0000	1.11
@@ -1 +1 @@
-yumex-0.44-3.tar.gz
+yumex-0.44-4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Feb 2006 10:31:06 -0000	1.12
+++ sources	8 Feb 2006 11:06:16 -0000	1.13
@@ -1 +1 @@
-b8952523c434814fa40426f6b73dbdcd  yumex-0.44-3.tar.gz
+dff849b49e993777a2f13e704a5fd5bd  yumex-0.44-4.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yumex.spec	8 Feb 2006 10:31:06 -0000	1.12
+++ yumex.spec	8 Feb 2006 11:06:16 -0000	1.13
@@ -1,8 +1,8 @@
-%define   build_v 3
+%define   build_v 4
 
 Name:     yumex
 Version:  0.44
-Release:  3.0%{?dist}
+Release:  4.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,6 +67,8 @@
 %{_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



From fedora-extras-commits at redhat.com  Wed Feb  8 11:09:18 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed,  8 Feb 2006 06:09:18 -0500
Subject: rpms/fuse import.log,1.4,1.5
Message-ID: <200602081109.k18B9qBS027235@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.5.2-1 on branch FC-4 from fuse-2.5.2-1.src.rpm
Version 2.5.2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	7 Feb 2006 21:11:16 -0000	1.4
+++ import.log	8 Feb 2006 11:09:17 -0000	1.5
@@ -1,3 +1,4 @@
 fuse-2_4_2-1:HEAD:fuse-2.4.2-1.src.rpm:1132774168
 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



From fedora-extras-commits at redhat.com  Wed Feb  8 11:09:24 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed,  8 Feb 2006 06:09:24 -0500
Subject: rpms/fuse/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200602081109.k18B9uWO027239@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	.cvsignore sources 
Log Message:
auto-import fuse-2.5.2-1 on branch FC-4 from fuse-2.5.2-1.src.rpm
Version 2.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Nov 2005 19:29:35 -0000	1.2
+++ .cvsignore	8 Feb 2006 11:09:24 -0000	1.3
@@ -1 +1 @@
-fuse-2.4.2.tar.gz
+fuse-2.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Nov 2005 19:29:35 -0000	1.2
+++ sources	8 Feb 2006 11:09:24 -0000	1.3
@@ -1 +1 @@
-6e3d9a580c45ddf4a06558c135c158c2  fuse-2.4.2.tar.gz
+ea565debe6c7486963bef05c45c50361  fuse-2.5.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 11:31:37 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed,  8 Feb 2006 06:31:37 -0500
Subject: fedora-security/audit fc4,1.147,1.148 fc5,1.56,1.57
Message-ID: <200602081131.k18BVbgM027397@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
Kernel and other updates



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- fc4	7 Feb 2006 13:28:03 -0000	1.147
+++ fc4	8 Feb 2006 11:31:29 -0000	1.148
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20060206
-Up to date FC4 as of 20060206
+Up to date CVE as of CVE email 20060207
+Up to date FC4 as of 20060207
 
 ** are items that need attention
 
@@ -8,7 +8,7 @@
 CVE-2006-0496 VULNERABLE (firefox)
 CVE-2006-0482 ignore (kernel) sparc only
 CVE-2006-0481 version (libpng, 1.2.7 only)
-CVE-2006-0454 VULNERABLE (kernel, fixed 2.6.15.3)
+CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected
@@ -48,7 +48,7 @@
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root
-CVE-2006-0095 VULNERABLE (kernel)
+CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] linux-2.6-dm-crypt-zero-key-before-free.patch
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2
 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- fc5	7 Feb 2006 13:28:03 -0000	1.56
+++ fc5	8 Feb 2006 11:31:29 -0000	1.57
@@ -24,7 +24,7 @@
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724:rawhide
-CVE-2006-0301 VULNERABLE (xpdf) bz#179423
+CVE-2006-0301 VULNERABLE (xpdf) bz#179423:rawhide
 CVE-2006-0301 VULNERABLE (poppler) bz#179424
 CVE-2006-0301 VULNERABLE (kdegraphics) bz#179425:rawhide
 CVE-2006-0299 VULNERABLE (firefox, fixed 1.5.0.1)



From fedora-extras-commits at redhat.com  Wed Feb  8 11:46:17 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed,  8 Feb 2006 06:46:17 -0500
Subject: rpms/galculator/devel galculator-1.2.5-gobject-unref.patch, NONE,
	1.1 galculator.spec, 1.7, 1.8
Message-ID: <200602081146.k18Bkn8w027441@cvs-int.fedora.redhat.com>

Author: tmraz

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

Modified Files:
	galculator.spec 
Added Files:
	galculator-1.2.5-gobject-unref.patch 
Log Message:
* Wed Feb  8 2006 Tomas Mraz  - 1.2.5-3
- GladeXML is GObject and cannot be g_free-d (#178227)


galculator-1.2.5-gobject-unref.patch:

--- NEW FILE galculator-1.2.5-gobject-unref.patch ---
--- galculator-1.2.5/src/ui.c.unref	2004-10-17 17:23:37.000000000 +0200
+++ galculator-1.2.5/src/ui.c	2006-02-08 12:39:32.000000000 +0100
@@ -313,7 +313,8 @@
 	if (dispctrl_xml) {
 		table_dispctrl = glade_xml_get_widget (dispctrl_xml, "table_dispctrl");
 		if (table_dispctrl) gtk_widget_destroy (table_dispctrl); 
-		g_free (dispctrl_xml);
+		g_object_unref (G_OBJECT (dispctrl_xml));
+		dispctrl_xml = NULL;
 	}	
 	/* now create the new one at location */
 	switch(location) {


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/galculator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- galculator.spec	18 Aug 2005 20:07:22 -0000	1.7
+++ galculator.spec	8 Feb 2006 11:46:16 -0000	1.8
@@ -1,12 +1,14 @@
 Name:           galculator
 Version:        1.2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
 Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
+Patch1:         galculator-1.2.5-gobject-unref.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -22,7 +24,7 @@
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .unref
 
 %build
 %configure
@@ -54,6 +56,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Tomas Mraz  - 1.2.5-3
+- GladeXML is GObject and cannot be g_free-d (#178227)
+
 * Thu Aug 18 2005 Michael Schwendt  - 1.2.5-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Feb  8 12:12:53 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed,  8 Feb 2006 07:12:53 -0500
Subject: rpms/smb4k/devel .cvsignore, 1.2, 1.3 smb4k.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <200602081213.k18CDQCY029361@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.6.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jan 2006 23:58:16 -0000	1.2
+++ .cvsignore	8 Feb 2006 12:12:52 -0000	1.3
@@ -1 +1 @@
-smb4k-0.6.5.tar.gz
+smb4k-0.6.7.tar.gz


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smb4k.spec	1 Feb 2006 20:47:36 -0000	1.2
+++ smb4k.spec	8 Feb 2006 12:12:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		smb4k
-Version:	0.6.5
-Release:	5%{?dist}
+Version:	0.6.7
+Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
@@ -109,44 +109,47 @@
 %{_libdir}/*.so
 
 %changelog
-* Wed Feb 01 2006 Marcin Garski  0.6.5-5
+* Wed Feb 08 2006 Marcin Garski  0.6.7-1
+- Updated to version 0.6.7
+
+* Wed Feb 01 2006 Marcin Garski  0.6.5-5
 - Fix GCC warnings
 - Don't own KDE directories
 
-* Wed Jan 18 2006 Marcin Garski  0.6.5-4
+* Wed Jan 18 2006 Marcin Garski  0.6.5-4
 - Remove libxml2 from BR
 - Add workaround for broken libtool archive (made by Dawid Gajownik)
 
-* Sun Jan 15 2006 Marcin Garski  0.6.5-3
+* Sun Jan 15 2006 Marcin Garski  0.6.5-3
 - Get rid of desktop-file-utils
 - Add --disable-dependency-tracking & --enable-final
 
-* Thu Jan 12 2006 Marcin Garski  0.6.5-2
+* Thu Jan 12 2006 Marcin Garski  0.6.5-2
 - Add kdebase-devel to BuildRequires
 
-* Wed Jan 11 2006 Marcin Garski  0.6.5-1
+* Wed Jan 11 2006 Marcin Garski  0.6.5-1
 - Updated to version 0.6.5 && spec cleanup for FE
 
-* Sun Sep 05 2004 Marcin Garski  0.4.1a-1.fc2
+* Sun Sep 05 2004 Marcin Garski  0.4.1a-1.fc2
 - Updated to version 0.4.1a
 
-* Thu Aug 31 2004 Marcin Garski  0.4.1-1.fc2
+* Thu Aug 31 2004 Marcin Garski  0.4.1-1.fc2
 - Updated to version 0.4.1
 
-* Wed Jun 02 2004 Marcin Garski  0.4.0-3.fc2
+* Wed Jun 02 2004 Marcin Garski  0.4.0-3.fc2
 - Rebuild for Fedora Core 2
 
-* Thu May 06 2004 Marcin Garski  0.4.0-2
+* Thu May 06 2004 Marcin Garski  0.4.0-2
 - Convert pl.po to UTF-8
 
-* Thu May 06 2004 Marcin Garski  0.4.0-1
+* Thu May 06 2004 Marcin Garski  0.4.0-1
 - Update to 0.4.0
 
-* Wed Jan 21 2004 Marcin Garski  0.3.2-1
+* Wed Jan 21 2004 Marcin Garski  0.3.2-1
 - Rebuild for Fedora Core 1
 
-* Thu Dec 18 2003 Marcin Garski  0.3.1-3
+* Thu Dec 18 2003 Marcin Garski  0.3.1-3
 - Cleanup specfile
 
-* Fri Nov 27 2003 Marcin Garski  0.3.1-2
-- Initial specfile based on specfile by Ian Geiser 
+* Fri Nov 27 2003 Marcin Garski  0.3.1-2
+- Initial specfile based on specfile by Ian Geiser 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jan 2006 23:58:16 -0000	1.2
+++ sources	8 Feb 2006 12:12:52 -0000	1.3
@@ -1 +1 @@
-6483086faa286db4ffe4de97643b4cf2  smb4k-0.6.5.tar.gz
+c5066914b7f08cbe1f7e7655c9f701aa  smb4k-0.6.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 12:14:46 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed,  8 Feb 2006 07:14:46 -0500
Subject: rpms/smb4k/FC-4 .cvsignore, 1.2, 1.3 smb4k.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200602081215.k18CFJiu029433@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.6.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jan 2006 23:58:16 -0000	1.2
+++ .cvsignore	8 Feb 2006 12:14:46 -0000	1.3
@@ -1 +1 @@
-smb4k-0.6.5.tar.gz
+smb4k-0.6.7.tar.gz


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/smb4k.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smb4k.spec	1 Feb 2006 20:47:36 -0000	1.2
+++ smb4k.spec	8 Feb 2006 12:14:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		smb4k
-Version:	0.6.5
-Release:	5%{?dist}
+Version:	0.6.7
+Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
@@ -109,44 +109,47 @@
 %{_libdir}/*.so
 
 %changelog
-* Wed Feb 01 2006 Marcin Garski  0.6.5-5
+* Wed Feb 08 2006 Marcin Garski  0.6.7-1
+- Updated to version 0.6.7
+
+* Wed Feb 01 2006 Marcin Garski  0.6.5-5
 - Fix GCC warnings
 - Don't own KDE directories
 
-* Wed Jan 18 2006 Marcin Garski  0.6.5-4
+* Wed Jan 18 2006 Marcin Garski  0.6.5-4
 - Remove libxml2 from BR
 - Add workaround for broken libtool archive (made by Dawid Gajownik)
 
-* Sun Jan 15 2006 Marcin Garski  0.6.5-3
+* Sun Jan 15 2006 Marcin Garski  0.6.5-3
 - Get rid of desktop-file-utils
 - Add --disable-dependency-tracking & --enable-final
 
-* Thu Jan 12 2006 Marcin Garski  0.6.5-2
+* Thu Jan 12 2006 Marcin Garski  0.6.5-2
 - Add kdebase-devel to BuildRequires
 
-* Wed Jan 11 2006 Marcin Garski  0.6.5-1
+* Wed Jan 11 2006 Marcin Garski  0.6.5-1
 - Updated to version 0.6.5 && spec cleanup for FE
 
-* Sun Sep 05 2004 Marcin Garski  0.4.1a-1.fc2
+* Sun Sep 05 2004 Marcin Garski  0.4.1a-1.fc2
 - Updated to version 0.4.1a
 
-* Thu Aug 31 2004 Marcin Garski  0.4.1-1.fc2
+* Thu Aug 31 2004 Marcin Garski  0.4.1-1.fc2
 - Updated to version 0.4.1
 
-* Wed Jun 02 2004 Marcin Garski  0.4.0-3.fc2
+* Wed Jun 02 2004 Marcin Garski  0.4.0-3.fc2
 - Rebuild for Fedora Core 2
 
-* Thu May 06 2004 Marcin Garski  0.4.0-2
+* Thu May 06 2004 Marcin Garski  0.4.0-2
 - Convert pl.po to UTF-8
 
-* Thu May 06 2004 Marcin Garski  0.4.0-1
+* Thu May 06 2004 Marcin Garski  0.4.0-1
 - Update to 0.4.0
 
-* Wed Jan 21 2004 Marcin Garski  0.3.2-1
+* Wed Jan 21 2004 Marcin Garski  0.3.2-1
 - Rebuild for Fedora Core 1
 
-* Thu Dec 18 2003 Marcin Garski  0.3.1-3
+* Thu Dec 18 2003 Marcin Garski  0.3.1-3
 - Cleanup specfile
 
-* Fri Nov 27 2003 Marcin Garski  0.3.1-2
-- Initial specfile based on specfile by Ian Geiser 
+* Fri Nov 27 2003 Marcin Garski  0.3.1-2
+- Initial specfile based on specfile by Ian Geiser 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jan 2006 23:58:16 -0000	1.2
+++ sources	8 Feb 2006 12:14:46 -0000	1.3
@@ -1 +1 @@
-6483086faa286db4ffe4de97643b4cf2  smb4k-0.6.5.tar.gz
+c5066914b7f08cbe1f7e7655c9f701aa  smb4k-0.6.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 12:21:15 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Wed,  8 Feb 2006 07:21:15 -0500
Subject: rpms/fwbuilder/devel .cvsignore, 1.5, 1.6 fwbuilder.desktop, 1.1,
	1.2 fwbuilder.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200602081221.k18CLlaJ029568@cvs-int.fedora.redhat.com>

Author: ertzing

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

Modified Files:
	.cvsignore fwbuilder.desktop fwbuilder.spec sources 
Log Message:
Fixes for BZ165308


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Feb 2006 17:40:22 -0000	1.5
+++ .cvsignore	8 Feb 2006 12:21:14 -0000	1.6
@@ -1,2 +1 @@
-fwbuilder.desktop
 fwbuilder-2.0.10.tar.gz


Index: fwbuilder.desktop
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwbuilder.desktop	23 Jan 2005 05:40:01 -0000	1.1
+++ fwbuilder.desktop	8 Feb 2006 12:21:14 -0000	1.2
@@ -2,9 +2,9 @@
 Encoding=UTF-8
 Name=Firewall Builder
 Comment=Design IPTables Firewall Rules
-Icon=/usr/share/pixmaps/fwbuilder/firewall.png
-Categories=Application;SystemSetup
-Exec=/usr/bin/fwbuilder
+Icon=fwbuilder
+Categories=System;Settings;Security;Qt;
+Exec=fwbuilder
 Type=Application
 StartupNotify=true
 Terminal=false


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fwbuilder.spec	5 Feb 2006 17:40:22 -0000	1.10
+++ fwbuilder.spec	8 Feb 2006 12:21:14 -0000	1.11
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
 Version:        2.0.10
-Release:        1%dist
+Release:        2%dist
 
 License:        GPL
 Group:          Applications/System
@@ -44,12 +44,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-make DDIR=$RPM_BUILD_ROOT install
+make DDIR=$RPM_BUILD_ROOT STRIPPROG=/bin/true install
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 # Add an icon for the menu system
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder
-install -c -m644 src/gui/icons/firewall.png $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder
+install -Dpm 644 src/gui/icons/firewall_48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fwbuilder.png
 
 # Add menu entry
 desktop-file-install --vendor fedora               \
@@ -60,18 +59,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+
+
 %files
 %defattr(-,root,root)
-%dir %{_datadir}/fwbuilder
-%dir %{_datadir}/pixmaps/fwbuilder
-%{_datadir}/fwbuilder/locale/*
-%{_datadir}/fwbuilder/platform/*
-%{_datadir}/fwbuilder/os/*
-%{_datadir}/fwbuilder/resources.xml
-%{_datadir}/fwbuilder/objects_init.xml
-%{_datadir}/fwbuilder/templates.xml
+%{_datadir}/fwbuilder
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/fwbuilder/firewall.png
+%{_datadir}/icons/hicolor/*/apps/fwbuilder.png
 %{_bindir}/fwbuilder
 %{_bindir}/fwblookup
 %{_bindir}/fwbedit
@@ -168,6 +167,13 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Wed Feb 08 2006 Ralf Ertzinger  2.0.10-2
+- Fixes for BZ165308 (thanks to Ville Skytt??)
+  - Don't strip binaries, fixes debuginfo
+  - Bring desktop entry categories up to date, so the entry is actually shown
+  - Make icon themeable
+  - Own all installed dirs
+
 * Sun Feb 05 2006 Ralf Ertzinger  2.0.10-1 
 - Update to 2.0.10
 - Spec file cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Feb 2006 17:40:22 -0000	1.5
+++ sources	8 Feb 2006 12:21:14 -0000	1.6
@@ -1,2 +1 @@
-8047b8aabc56f1005f7e551278083922  fwbuilder.desktop
 3a0946ed322df40be9814124ac7a9cfd  fwbuilder-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 12:48:57 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed,  8 Feb 2006 07:48:57 -0500
Subject: rpms/digikam/devel .cvsignore, 1.4, 1.5 digikam.spec, 1.21,
	1.22 sources, 1.4, 1.5
Message-ID: <200602081249.k18CnUvj029691@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Exclude x-raw.desktop (bug #179754)
- Don't own icons directory



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Jan 2006 22:34:50 -0000	1.4
+++ .cvsignore	8 Feb 2006 12:48:57 -0000	1.5
@@ -1,3 +1 @@
-digikam-0.7.4.tar.bz2
-digikam-0.8.0.tar.bz2
 digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- digikam.spec	23 Jan 2006 22:34:50 -0000	1.21
+++ digikam.spec	8 Feb 2006 12:48:57 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -74,6 +74,9 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libdigikam.la
 
+# Fix bug #179754
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mimelnk/
+
 %post
 /sbin/ldconfig
 update-desktop-database &> /dev/null ||:
@@ -107,8 +110,7 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/showfoto/
-%{_datadir}/icons/hicolor/*
-%{_datadir}/mimelnk/image/*.desktop
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -119,76 +121,80 @@
 %{_libdir}/libdigikam.so
 
 %changelog
-* Mon Jan 23 2006 Marcin Garski  0.8.1-1
+* Wed Feb 08 2006 Marcin Garski  0.8.1-2
+- Exclude x-raw.desktop (bug #179754)
+- Don't own icons directory
+
+* Mon Jan 23 2006 Marcin Garski  0.8.1-1
 - Add --enable-final
 - Remove GCC 4.1 patch, applied upstream
 - Update to version 0.8.1
 
-* Mon Jan 23 2006 Marcin Garski  0.8.0-16
+* Mon Jan 23 2006 Marcin Garski  0.8.0-16
 - Add some stuff to BuildRequires (finally fix bug #178031)
 
-* Tue Jan 17 2006 Marcin Garski  0.8.0-15
+* Tue Jan 17 2006 Marcin Garski  0.8.0-15
 - Remove redundant BuildRequires (bug #178031)
 
-* Mon Jan 16 2006 Marcin Garski  0.8.0-14
+* Mon Jan 16 2006 Marcin Garski  0.8.0-14
 - Remove --disable-dependency-tracking
 
-* Mon Jan 16 2006 Marcin Garski  0.8.0-13
+* Mon Jan 16 2006 Marcin Garski  0.8.0-13
 - Remove --enable-final (caused compilation errors)
 
-* Sun Jan 15 2006 Marcin Garski  0.8.0-12
+* Sun Jan 15 2006 Marcin Garski  0.8.0-12
 - Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
 - Add --disable-dependency-tracking & --enable-final
 
-* Wed Dec 14 2005 Marcin Garski  0.8.0-11
+* Wed Dec 14 2005 Marcin Garski  0.8.0-11
 - Add libart_lgpl-devel and gamin-devel to BR
 
-* Wed Dec 14 2005 Marcin Garski  0.8.0-10
+* Wed Dec 14 2005 Marcin Garski  0.8.0-10
 - Add libacl-devel to BR
 
-* Wed Dec 14 2005 Marcin Garski  0.8.0-9
+* Wed Dec 14 2005 Marcin Garski  0.8.0-9
 - Add libidn-devel to BR
 
-* Wed Dec 14 2005 Marcin Garski  0.8.0-8
+* Wed Dec 14 2005 Marcin Garski  0.8.0-8
 - Fix compile on GCC 4.1
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-7
+* Tue Dec 13 2005 Marcin Garski  0.8.0-7
 - Remove autoreconf
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-6
+* Tue Dec 13 2005 Marcin Garski  0.8.0-6
 - Remove patch
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-5
+* Tue Dec 13 2005 Marcin Garski  0.8.0-5
 - Last chance to make it right (modular X.Org)
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-4
+* Tue Dec 13 2005 Marcin Garski  0.8.0-4
 - Try to build for modular X.Org
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-3
+* Tue Dec 13 2005 Marcin Garski  0.8.0-3
 - Add new paths for modular X.Org
 
-* Fri Dec 09 2005 Marcin Garski  0.8.0-2
+* Fri Dec 09 2005 Marcin Garski  0.8.0-2
 - Work around for modular X.Org paths
 
-* Thu Dec 01 2005 Marcin Garski  0.8.0-1
+* Thu Dec 01 2005 Marcin Garski  0.8.0-1
 - Add description about digikamimageplugins and kipi-plugins
 - Remove 64 bit patch, applied upstream
 - Update to version 0.8.0
 
-* Sat Oct 22 2005 Marcin Garski  0.7.4-4
+* Sat Oct 22 2005 Marcin Garski  0.7.4-4
 - Exclude libdigikam.la (bug #171503)
 
-* Sat Sep 17 2005 Marcin Garski  0.7.4-3
+* Sat Sep 17 2005 Marcin Garski  0.7.4-3
 - Change confusing warning about Big Endian Platform
 
-* Tue Sep 13 2005 Marcin Garski  0.7.4-2
+* Tue Sep 13 2005 Marcin Garski  0.7.4-2
 - Spec improvements
 
-* Mon Sep 12 2005 Marcin Garski  0.7.4-1
+* Mon Sep 12 2005 Marcin Garski  0.7.4-1
 - Updated to version 0.7.4 & clean up for Fedora Extras
 
-* Sat Jun 26 2004 Marcin Garski  0.6.2-1.fc2
+* Sat Jun 26 2004 Marcin Garski  0.6.2-1.fc2
 - Updated to version 0.6.2
 
-* Wed Jun 09 2004 Marcin Garski  0.6.2RC-1.fc2
+* Wed Jun 09 2004 Marcin Garski  0.6.2RC-1.fc2
 - Initial specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Jan 2006 22:34:50 -0000	1.4
+++ sources	8 Feb 2006 12:48:57 -0000	1.5
@@ -1,2 +1 @@
-9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
 2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Feb  8 12:59:01 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed,  8 Feb 2006 07:59:01 -0500
Subject: rpms/digikam/FC-4 .cvsignore, 1.4, 1.5 digikam.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200602081259.k18CxYYL029820@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Exclude x-raw.desktop (bug #179754)
- Don't own icons directory



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Jan 2006 23:17:38 -0000	1.4
+++ .cvsignore	8 Feb 2006 12:59:01 -0000	1.5
@@ -1,3 +1 @@
-digikam-0.7.4.tar.bz2
-digikam-0.8.0.tar.bz2
 digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/digikam.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- digikam.spec	23 Jan 2006 23:17:38 -0000	1.5
+++ digikam.spec	8 Feb 2006 12:59:01 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -74,6 +74,9 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libdigikam.la
 
+# Fix bug #179754
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mimelnk/
+
 %post
 /sbin/ldconfig
 update-desktop-database &> /dev/null ||:
@@ -107,8 +110,7 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/showfoto/
-%{_datadir}/icons/hicolor/*
-%{_datadir}/mimelnk/image/*.desktop
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -119,76 +121,80 @@
 %{_libdir}/libdigikam.so
 
 %changelog
-* Mon Jan 23 2006 Marcin Garski  0.8.1-1
+* Wed Feb 08 2006 Marcin Garski  0.8.1-2
+- Exclude x-raw.desktop (bug #179754)
+- Don't own icons directory
+
+* Mon Jan 23 2006 Marcin Garski  0.8.1-1
 - Add --enable-final
 - Remove GCC 4.1 patch, applied upstream
 - Update to version 0.8.1
 
-* Mon Jan 23 2006 Marcin Garski  0.8.0-16
+* Mon Jan 23 2006 Marcin Garski  0.8.0-16
 - Add some stuff to BuildRequires (finally fix bug #178031)
 
-* Tue Jan 17 2006 Marcin Garski  0.8.0-15
+* Tue Jan 17 2006 Marcin Garski  0.8.0-15
 - Remove redundant BuildRequires (bug #178031)
 
-* Mon Jan 16 2006 Marcin Garski  0.8.0-14
+* Mon Jan 16 2006 Marcin Garski  0.8.0-14
 - Remove --disable-dependency-tracking
 
-* Mon Jan 16 2006 Marcin Garski  0.8.0-13
+* Mon Jan 16 2006 Marcin Garski  0.8.0-13
 - Remove --enable-final (caused compilation errors)
 
-* Sun Jan 15 2006 Marcin Garski  0.8.0-12
+* Sun Jan 15 2006 Marcin Garski  0.8.0-12
 - Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
 - Add --disable-dependency-tracking & --enable-final
 
-* Wed Dec 14 2005 Marcin Garski  0.8.0-11
+* Wed Dec 14 2005 Marcin Garski  0.8.0-11
 - Add libart_lgpl-devel and gamin-devel to BR
 
-* Wed Dec 14 2005 Marcin Garski  0.8.0-10
+* Wed Dec 14 2005 Marcin Garski  0.8.0-10
 - Add libacl-devel to BR
 
-* Wed Dec 14 2005 Marcin Garski  0.8.0-9
+* Wed Dec 14 2005 Marcin Garski  0.8.0-9
 - Add libidn-devel to BR
 
-* Wed Dec 14 2005 Marcin Garski  0.8.0-8
+* Wed Dec 14 2005 Marcin Garski  0.8.0-8
 - Fix compile on GCC 4.1
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-7
+* Tue Dec 13 2005 Marcin Garski  0.8.0-7
 - Remove autoreconf
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-6
+* Tue Dec 13 2005 Marcin Garski  0.8.0-6
 - Remove patch
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-5
+* Tue Dec 13 2005 Marcin Garski  0.8.0-5
 - Last chance to make it right (modular X.Org)
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-4
+* Tue Dec 13 2005 Marcin Garski  0.8.0-4
 - Try to build for modular X.Org
 
-* Tue Dec 13 2005 Marcin Garski  0.8.0-3
+* Tue Dec 13 2005 Marcin Garski  0.8.0-3
 - Add new paths for modular X.Org
 
-* Fri Dec 09 2005 Marcin Garski  0.8.0-2
+* Fri Dec 09 2005 Marcin Garski  0.8.0-2
 - Work around for modular X.Org paths
 
-* Thu Dec 01 2005 Marcin Garski  0.8.0-1
+* Thu Dec 01 2005 Marcin Garski  0.8.0-1
 - Add description about digikamimageplugins and kipi-plugins
 - Remove 64 bit patch, applied upstream
 - Update to version 0.8.0
 
-* Sat Oct 22 2005 Marcin Garski  0.7.4-4
+* Sat Oct 22 2005 Marcin Garski  0.7.4-4
 - Exclude libdigikam.la (bug #171503)
 
-* Sat Sep 17 2005 Marcin Garski  0.7.4-3
+* Sat Sep 17 2005 Marcin Garski  0.7.4-3
 - Change confusing warning about Big Endian Platform
 
-* Tue Sep 13 2005 Marcin Garski  0.7.4-2
+* Tue Sep 13 2005 Marcin Garski  0.7.4-2
 - Spec improvements
 
-* Mon Sep 12 2005 Marcin Garski  0.7.4-1
+* Mon Sep 12 2005 Marcin Garski  0.7.4-1
 - Updated to version 0.7.4 & clean up for Fedora Extras
 
-* Sat Jun 26 2004 Marcin Garski  0.6.2-1.fc2
+* Sat Jun 26 2004 Marcin Garski  0.6.2-1.fc2
 - Updated to version 0.6.2
 
-* Wed Jun 09 2004 Marcin Garski  0.6.2RC-1.fc2
+* Wed Jun 09 2004 Marcin Garski  0.6.2RC-1.fc2
 - Initial specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Jan 2006 23:17:38 -0000	1.4
+++ sources	8 Feb 2006 12:59:01 -0000	1.5
@@ -1,2 +1 @@
-9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
 2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Feb  8 13:35:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  8 Feb 2006 08:35:46 -0500
Subject: rpms/wine/FC-3 wine.spec,1.8,1.9
Message-ID: <200602081336.k18DaIQh031830@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	wine.spec 
Log Message:
- fix typo in script part



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine.spec	2 Feb 2006 23:19:13 -0000	1.8
+++ wine.spec	8 Feb 2006 13:35:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -49,7 +49,7 @@
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
-Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
@@ -240,13 +240,16 @@
 
 %post
 /sbin/ldconfig
+update-desktop-database &>/dev/null || :
+if [ $1 = 1 ]; then
 /sbin/chkconfig --add wine
 /sbin/chkconfig --level 2345 wine on
 /sbin/service wine start &>/dev/null || :
-update-desktop-database &>/dev/null || :
+fi
 
 %preun
-if test "$1" = "0"; then
+if [ $1 = 0 ]; then
+	/sbin/service wine stop >/dev/null 2>&1
 	/sbin/chkconfig --del wine
 fi
 
@@ -676,6 +679,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Feb 08 2006 Andreas Bierfert 
+0.9.7-2
+- fix up post/preun scriptlets (#178954)
+
 * Thu Feb 02 2006 Andreas Bierfert 
 0.9.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Feb  8 13:35:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  8 Feb 2006 08:35:52 -0500
Subject: rpms/wine/FC-4 wine.spec,1.10,1.11
Message-ID: <200602081336.k18DaOGB031833@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	wine.spec 
Log Message:
- fix typo in script part



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wine.spec	2 Feb 2006 23:19:19 -0000	1.10
+++ wine.spec	8 Feb 2006 13:35:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -49,7 +49,7 @@
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
-Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
@@ -240,13 +240,16 @@
 
 %post
 /sbin/ldconfig
+update-desktop-database &>/dev/null || :
+if [ $1 = 1 ]; then
 /sbin/chkconfig --add wine
 /sbin/chkconfig --level 2345 wine on
 /sbin/service wine start &>/dev/null || :
-update-desktop-database &>/dev/null || :
+fi
 
 %preun
-if test "$1" = "0"; then
+if [ $1 = 0 ]; then
+	/sbin/service wine stop >/dev/null 2>&1
 	/sbin/chkconfig --del wine
 fi
 
@@ -676,6 +679,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Feb 08 2006 Andreas Bierfert 
+0.9.7-2
+- fix up post/preun scriptlets (#178954)
+
 * Thu Feb 02 2006 Andreas Bierfert 
 0.9.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Feb  8 13:35:58 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  8 Feb 2006 08:35:58 -0500
Subject: rpms/wine/devel wine.spec,1.12,1.13
Message-ID: <200602081336.k18DaUAX031836@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	wine.spec 
Log Message:
- fix typo in script part



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wine.spec	2 Feb 2006 23:19:25 -0000	1.12
+++ wine.spec	8 Feb 2006 13:35:58 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:		wine
 Version:	0.9.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -61,7 +61,7 @@
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
-Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
@@ -253,13 +253,16 @@
 
 %post
 /sbin/ldconfig
+update-desktop-database &>/dev/null || :
+if [ $1 = 1 ]; then
 /sbin/chkconfig --add wine
 /sbin/chkconfig --level 2345 wine on
 /sbin/service wine start &>/dev/null || :
-update-desktop-database &>/dev/null || :
+fi
 
 %preun
-if test "$1" = "0"; then
+if [ $1 = 0 ]; then
+	/sbin/service wine stop >/dev/null 2>&1
 	/sbin/chkconfig --del wine
 fi
 
@@ -689,6 +692,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Feb 08 2006 Andreas Bierfert 
+0.9.7-2
+- fix up post/preun scriplets (#178954)
+
 * Thu Feb 02 2006 Andreas Bierfert 
 0.9.7-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Feb  8 14:21:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 09:21:19 -0500
Subject: rpms/perl-Crypt-DSA - New directory
Message-ID: <200602081421.k18ELLHi001472@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1464/perl-Crypt-DSA

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-DSA added to the repository




From fedora-extras-commits at redhat.com  Wed Feb  8 14:21:25 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 09:21:25 -0500
Subject: rpms/perl-Crypt-DSA/devel - New directory
Message-ID: <200602081421.k18ELR9f001487@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-serv1464/perl-Crypt-DSA/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-DSA/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Feb  8 14:21:54 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 09:21:54 -0500
Subject: rpms/perl-Crypt-DSA Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602081421.k18ELu40001521@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1509

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-DSA


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb  8 14:22:00 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 09:22:00 -0500
Subject: rpms/perl-Crypt-DSA/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602081422.k18EM2Uh001541@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-serv1509/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-DSA


--- NEW 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 Feb  8 14:23:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 09:23:01 -0500
Subject: rpms/perl-Crypt-DSA import.log,1.1,1.2
Message-ID: <200602081423.k18ENXTa001622@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1583

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-DSA-0.13-1 on branch devel from perl-Crypt-DSA-0.13-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DSA/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Feb 2006 14:21:54 -0000	1.1
+++ import.log	8 Feb 2006 14:23:01 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-DSA-0_13-1:HEAD:perl-Crypt-DSA-0.13-1.src.rpm:1139408570



From fedora-extras-commits at redhat.com  Wed Feb  8 14:23:07 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 09:23:07 -0500
Subject: rpms/perl-Crypt-DSA/devel perl-Crypt-DSA.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602081423.k18ENdvO001626@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-serv1583/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-DSA.spec 
Log Message:
auto-import perl-Crypt-DSA-0.13-1 on branch devel from perl-Crypt-DSA-0.13-1.src.rpm


--- NEW FILE perl-Crypt-DSA.spec ---
Summary:	Perl module for DSA signatures and key generation
Name:		perl-Crypt-DSA
Version:	0.13
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-DSA/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BT/BTROTT/Crypt-DSA-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(Digest::SHA1)
BuildRequires:	perl(Convert::PEM) >= 0.07
BuildRequires:	perl(Data::Buffer) >= 0.01

%description
Crypt::DSA is an implementation of the DSA (Digital Signature Algorithm)
signature verification system. This package provides DSA signing, signature
verification, and key generation.

%prep
%setup -q -n Crypt-DSA-%{version}

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

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes ToDo
%{perl_vendorlib}/Crypt/
%{_mandir}/man3/Crypt::DSA.3pm*
%{_mandir}/man3/Crypt::DSA::Key.3pm*
%{_mandir}/man3/Crypt::DSA::Key::PEM.3pm*
%{_mandir}/man3/Crypt::DSA::Key::SSH2.3pm*
%{_mandir}/man3/Crypt::DSA::KeyChain.3pm*
%{_mandir}/man3/Crypt::DSA::Signature.3pm*
%{_mandir}/man3/Crypt::DSA::Util.3pm*

%changelog
* Mon Nov 28 2005 Paul Howarth  0.13-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Feb 2006 14:21:59 -0000	1.1
+++ .cvsignore	8 Feb 2006 14:23:06 -0000	1.2
@@ -0,0 +1 @@
+Crypt-DSA-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Feb 2006 14:21:59 -0000	1.1
+++ sources	8 Feb 2006 14:23:06 -0000	1.2
@@ -0,0 +1 @@
+269261448ecc6b3b82a854e3b774c4ae  Crypt-DSA-0.13.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 14:25:21 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Wed,  8 Feb 2006 09:25:21 -0500
Subject: rpms/fwbuilder/FC-4 .cvsignore, 1.5, 1.6 fwbuilder.desktop, 1.1,
	1.2 fwbuilder.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200602081425.k18EPsEs001742@cvs-int.fedora.redhat.com>

Author: ertzing

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

Modified Files:
	.cvsignore fwbuilder.desktop fwbuilder.spec sources 
Log Message:
Fixes for BZ165308


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Feb 2006 17:54:26 -0000	1.5
+++ .cvsignore	8 Feb 2006 14:25:21 -0000	1.6
@@ -1,2 +1 @@
-fwbuilder.desktop
 fwbuilder-2.0.10.tar.gz


Index: fwbuilder.desktop
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-4/fwbuilder.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwbuilder.desktop	23 Jan 2005 05:40:01 -0000	1.1
+++ fwbuilder.desktop	8 Feb 2006 14:25:21 -0000	1.2
@@ -2,9 +2,9 @@
 Encoding=UTF-8
 Name=Firewall Builder
 Comment=Design IPTables Firewall Rules
-Icon=/usr/share/pixmaps/fwbuilder/firewall.png
-Categories=Application;SystemSetup
-Exec=/usr/bin/fwbuilder
+Icon=fwbuilder
+Categories=System;Settings;Security;Qt;
+Exec=fwbuilder
 Type=Application
 StartupNotify=true
 Terminal=false


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-4/fwbuilder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fwbuilder.spec	5 Feb 2006 17:54:26 -0000	1.10
+++ fwbuilder.spec	8 Feb 2006 14:25:21 -0000	1.11
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
 Version:        2.0.10
-Release:        1%dist
+Release:        2%dist
 
 License:        GPL
 Group:          Applications/System
@@ -44,12 +44,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-make DDIR=$RPM_BUILD_ROOT install
+make DDIR=$RPM_BUILD_ROOT STRIPPROG=/bin/true install
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 # Add an icon for the menu system
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder
-install -c -m644 src/gui/icons/firewall.png $RPM_BUILD_ROOT/usr/share/pixmaps/fwbuilder
+install -Dpm 644 src/gui/icons/firewall_48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/fwbuilder.png
 
 # Add menu entry
 desktop-file-install --vendor fedora               \
@@ -60,18 +59,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+
+
 %files
 %defattr(-,root,root)
-%dir %{_datadir}/fwbuilder
-%dir %{_datadir}/pixmaps/fwbuilder
-%{_datadir}/fwbuilder/locale/*
-%{_datadir}/fwbuilder/platform/*
-%{_datadir}/fwbuilder/os/*
-%{_datadir}/fwbuilder/resources.xml
-%{_datadir}/fwbuilder/objects_init.xml
-%{_datadir}/fwbuilder/templates.xml
+%{_datadir}/fwbuilder
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/fwbuilder/firewall.png
+%{_datadir}/icons/hicolor/*/apps/fwbuilder.png
 %{_bindir}/fwbuilder
 %{_bindir}/fwblookup
 %{_bindir}/fwbedit
@@ -168,6 +167,13 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Wed Feb 08 2006 Ralf Ertzinger  2.0.10-2
+- Fixes for BZ165308 (thanks to Ville Skytt??)
+  - Don't strip binaries, fixes debuginfo
+  - Bring desktop entry categories up to date, so the entry is actually shown
+  - Make icon themeable
+  - Own all installed dirs
+
 * Sun Feb 05 2006 Ralf Ertzinger  2.0.10-1 
 - Update to 2.0.10
 - Spec file cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Feb 2006 17:54:26 -0000	1.5
+++ sources	8 Feb 2006 14:25:21 -0000	1.6
@@ -1,2 +1 @@
-8047b8aabc56f1005f7e551278083922  fwbuilder.desktop
 3a0946ed322df40be9814124ac7a9cfd  fwbuilder-2.0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 14:27:03 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed,  8 Feb 2006 09:27:03 -0500
Subject: owners owners.list,1.619,1.620
Message-ID: <200602081427.k18ERZ38001806@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	owners.list 
Log Message:
Add perl-Crypt-DSA



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.619
retrieving revision 1.620
diff -u -r1.619 -r1.620
--- owners.list	8 Feb 2006 07:28:40 -0000	1.619
+++ owners.list	8 Feb 2006 14:27:00 -0000	1.620
@@ -805,6 +805,7 @@
 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
 Fedora Extras|perl-Crypt-DES_EDE3|Crypt::DES_EDE3 Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DH|Perl module implementing the Diffie-Hellman key exchange system|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-DSA|Perl module for DSA signatures and key generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Feb  8 14:31:08 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed,  8 Feb 2006 09:31:08 -0500
Subject: owners owners.list,1.620,1.621
Message-ID: <200602081431.k18EVfTN001856@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	owners.list 
Log Message:
removed old package name GiNaC (now ginac)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -r1.620 -r1.621
--- owners.list	8 Feb 2006 14:27:00 -0000	1.620
+++ owners.list	8 Feb 2006 14:31:08 -0000	1.621
@@ -291,7 +291,6 @@
 Fedora Extras|gift|Daemon for communicating with filesharing protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Feb  8 14:42:31 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 09:42:31 -0500
Subject: rpms/advancecomp/devel advancecomp.spec,1.12,1.13
Message-ID: <200602081443.k18Eh3WP001921@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	advancecomp.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: advancecomp.spec
===================================================================
RCS file: /cvs/extras/rpms/advancecomp/devel/advancecomp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- advancecomp.spec	2 Nov 2005 12:20:04 -0000	1.12
+++ advancecomp.spec	8 Feb 2006 14:42:30 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Recompression utilities for .PNG, .MNG and .ZIP files
 Name: advancecomp
 Version: 1.15
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Emulators
 URL: http://advancemame.sourceforge.net/
@@ -42,6 +42,12 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1.15-3
+- Rebuild for new gcc/glibc.
+
+* Tue Jan 24 2006 Matthias Saou  1.15-2
+- Rebuild for FC5.
+
 * Wed Nov  2 2005 Matthias Saou  1.15-1
 - Update to 1.15, includes 64bit fixes.
 



From fedora-extras-commits at redhat.com  Wed Feb  8 14:43:43 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed,  8 Feb 2006 09:43:43 -0500
Subject: extras-buildsys/server Builder.py,1.28,1.29
Message-ID: <200602081443.k18Ehho9001952@cvs-int.fedora.redhat.com>

Author: dcbw

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

Modified Files:
	Builder.py 
Log Message:
Fix some builder stuff


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Builder.py	24 Jan 2006 13:01:09 -0000	1.28
+++ Builder.py	8 Feb 2006 14:43:35 -0000	1.29
@@ -45,9 +45,9 @@
         self.failed = False
 
         threading.Thread.__init__(self)
-        self.setName("BuildingJobsCheck: %s" % address)
 
     def run(self):
+        self.setName("BuildingJobsCheck: %s" % address)
         jobs = {}
         free_slots = 0
         try:
@@ -147,6 +147,8 @@
             else:
                 # Error of some kind
                 self._unavail_count = self._unavail_count + 1
+        else:
+            self._unavail_count = self._unavail_count + 1
 
         return {}
 



From fedora-extras-commits at redhat.com  Wed Feb  8 14:46:57 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed,  8 Feb 2006 09:46:57 -0500
Subject: extras-buildsys/server Builder.py,1.29,1.30
Message-ID: <200602081446.k18Ekvjg002040@cvs-int.fedora.redhat.com>

Author: dcbw

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

Modified Files:
	Builder.py 
Log Message:
Fix variable scoping error


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Builder.py	8 Feb 2006 14:43:35 -0000	1.29
+++ Builder.py	8 Feb 2006 14:46:49 -0000	1.30
@@ -47,7 +47,7 @@
         threading.Thread.__init__(self)
 
     def run(self):
-        self.setName("BuildingJobsCheck: %s" % address)
+        self.setName("BuildingJobsCheck: %s" % self._address)
         jobs = {}
         free_slots = 0
         try:



From fedora-extras-commits at redhat.com  Wed Feb  8 14:47:29 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Wed,  8 Feb 2006 09:47:29 -0500
Subject: rpms/hping2/devel hping2.spec,1.7,1.8
Message-ID: <200602081448.k18Em2ZY002075@cvs-int.fedora.redhat.com>

Author: pvrabec

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

Modified Files:
	hping2.spec 
Log Message:
rebuilt



Index: hping2.spec
===================================================================
RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hping2.spec	26 Jul 2005 16:28:06 -0000	1.7
+++ hping2.spec	8 Feb 2006 14:47:29 -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
 
 Group: Applications/Internet
@@ -52,6 +52,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Feb 08 2006 Peter Vrabec 
+- rebuilt
+
 * Tue Jul 26 2005 Michael Schwendt  - 2.0.0-0.5.rc3
 - Fix "local variable used before set" (#149776).
 - Use rpm optflags.



From fedora-extras-commits at redhat.com  Wed Feb  8 14:49:15 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 09:49:15 -0500
Subject: rpms/bbkeys/devel bbkeys.spec,1.9,1.10
Message-ID: <200602081449.k18Enlq9002126@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	bbkeys.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: bbkeys.spec
===================================================================
RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bbkeys.spec	24 Jan 2006 10:22:17 -0000	1.9
+++ bbkeys.spec	8 Feb 2006 14:49:14 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Completely configurable key-combo grabber for blackbox
 Name: bbkeys
 Version: 0.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://bbkeys.sourceforge.net/
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  0.9.0-3
+- Rebuild for new gcc/glibc.
+
 * Mon Jan 23 2006 Matthias Saou  0.9.0-2
 - Add conditional to build with/without modular X depending on FC version.
 



From fedora-extras-commits at redhat.com  Wed Feb  8 14:49:58 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed,  8 Feb 2006 09:49:58 -0500
Subject: owners owners.list,1.621,1.622
Message-ID: <200602081450.k18EoUHo002233@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
k3b-ape has not made it due to licencing issues


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -r1.621 -r1.622
--- owners.list	8 Feb 2006 14:31:08 -0000	1.621
+++ owners.list	8 Feb 2006 14:49:57 -0000	1.622
@@ -449,7 +449,6 @@
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
-Fedora Extras|k3b-ape|Monkey's audio decoder/encoder plugin for K3b|mihai at xcyb.org|extras-qa at fedoraproject.org|
 Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kanatest|Hiragana and Katakana drill tool|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|kannel|WAP and SMS gateway|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Feb  8 14:52:02 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 09:52:02 -0500
Subject: rpms/blackbox/devel blackbox.spec,1.11,1.12
Message-ID: <200602081452.k18EqYXI002280@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	blackbox.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- blackbox.spec	24 Jan 2006 10:22:10 -0000	1.11
+++ blackbox.spec	8 Feb 2006 14:52:02 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.70.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://blackboxwm.sourceforge.net/
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  0.70.1-3
+- Rebuild for new gcc/glibc.
+
 * Mon Jan 23 2006 Matthias Saou  0.70.1-2
 - Add conditional to build with/without modular X depending on FC version.
 



From fedora-extras-commits at redhat.com  Wed Feb  8 14:54:44 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 09:54:44 -0500
Subject: rpms/boa/devel boa.spec,1.7,1.8
Message-ID: <200602081455.k18EtGb1002363@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	boa.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: boa.spec
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- boa.spec	16 Nov 2005 15:27:20 -0000	1.7
+++ boa.spec	8 Feb 2006 14:54:44 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: Single-tasking HTTP server
 Name: boa
 Version: 0.94.14
-Release: 0.2%{?rcver:.%{rcver}}%{?dist}
+Release: 0.3%{?rcver:.%{rcver}}%{?dist}
 URL: http://www.boa.org/
 License: GPL
 Group: System Environment/Daemons
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  0.94.14-0.3.rc21
+- Rebuild for new gcc/glibc.
+
 * Wed Nov 16 2005 Matthias Saou  0.94.14-0.2.rc21
 - Make example cgi scripts -x to avoid perl dependency side-effect (#173335).
 



From fedora-extras-commits at redhat.com  Wed Feb  8 15:00:23 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:00:23 -0500
Subject: rpms/lighttpd/devel .cvsignore, 1.13, 1.14 lighttpd.spec, 1.20,
	1.21 sources, 1.13, 1.14 lighttpd-1.4.9-mod_fastcgi-fix.patch,
	1.1, NONE
Message-ID: <200602081500.k18F0uS3002495@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore lighttpd.spec sources 
Removed Files:
	lighttpd-1.4.9-mod_fastcgi-fix.patch 
Log Message:
Update to 1.4.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	16 Jan 2006 10:18:56 -0000	1.13
+++ .cvsignore	8 Feb 2006 15:00:23 -0000	1.14
@@ -1 +1 @@
-lighttpd-1.4.9.tar.gz
+lighttpd-1.4.10.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lighttpd.spec	25 Jan 2006 09:57:47 -0000	1.20
+++ lighttpd.spec	8 Feb 2006 15:00:23 -0000	1.21
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.9
-Release: 2%{?dist}
+Version: 1.4.10
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -16,7 +16,6 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
-Patch1: lighttpd-1.4.9-mod_fastcgi-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -68,7 +67,6 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -p1 -b .mod_fastcgi-fix
 
 
 %build
@@ -175,6 +173,10 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1.4.10-1
+- Update to 1.4.10.
+- Remove now included fix.
+
 * Wed Jan 25 2006 Matthias Saou  1.4.9-2
 - Add mod_fastcgi-fix patch to fix crash on backend overload.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	16 Jan 2006 10:18:56 -0000	1.13
+++ sources	8 Feb 2006 15:00:23 -0000	1.14
@@ -1 +1 @@
-20a171774a0615069de3704db52483aa  lighttpd-1.4.9.tar.gz
+51e42c2cc98a1f9986b9f232ff5a01f2  lighttpd-1.4.10.tar.gz


--- lighttpd-1.4.9-mod_fastcgi-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Feb  8 15:02:01 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:02:01 -0500
Subject: rpms/camE/devel camE.spec,1.8,1.9
Message-ID: <200602081502.k18F2YSZ004363@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	camE.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: camE.spec
===================================================================
RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- camE.spec	23 Jan 2006 17:40:41 -0000	1.8
+++ camE.spec	8 Feb 2006 15:02:01 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Rewrite of the xawtv webcam app, which adds imlib2 support
 Name: camE
 Version: 1.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://linuxbrit.co.uk/camE/
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1.9-5
+- Rebuild for new gcc/glibc.
+
 * Mon Jan 23 2006 Matthias Saou  1.9-4
 - Remove explicit X build requirement since giblib-devel requires imlib2-devel
   which in turn requires all necessary X development packages.



From fedora-extras-commits at redhat.com  Wed Feb  8 15:05:40 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:05:40 -0500
Subject: rpms/csmash/devel csmash.spec,1.10,1.11
Message-ID: <200602081506.k18F6D87004449@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	csmash.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- csmash.spec	23 Jan 2006 18:23:27 -0000	1.10
+++ csmash.spec	8 Feb 2006 15:05:40 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://cannonsmash.sourceforge.net/
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  0.6.6-11
+- Rebuild for new gcc/glibc.
+
 * Mon Jan 23 2006 Matthias Saou  0.6.6-10
 - Add conditional to build with/without modular X depending on FC version.
 - Include gcc 4.1 patch to fix "extra qualification" errors.



From fedora-extras-commits at redhat.com  Wed Feb  8 15:10:20 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:10:20 -0500
Subject: rpms/diradmin/devel diradmin.spec,1.9,1.10
Message-ID: <200602081510.k18FArX0004560@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	diradmin.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: diradmin.spec
===================================================================
RCS file: /cvs/extras/rpms/diradmin/devel/diradmin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- diradmin.spec	17 Nov 2005 14:25:35 -0000	1.9
+++ diradmin.spec	8 Feb 2006 15:10:20 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: User control management tool for LDAP directories
 Name: diradmin
 Version: 1.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://diradmin.open-it.org/
@@ -88,6 +88,10 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1.7.1-3
+- Rebuild for new gcc/glibc.
+- Still no fix for #171557 though, sorry.
+
 * Thu Nov 17 2005 Matthias Saou  1.7.1-2
 - Rebuild against new openssl library.
 - Add modular X build requirements.



From fedora-extras-commits at redhat.com  Wed Feb  8 15:10:21 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Wed,  8 Feb 2006 10:10:21 -0500
Subject: rpms/nuttcp/devel nuttcp.spec,1.1,1.2
Message-ID: <200602081510.k18FArG6004561@cvs-int.fedora.redhat.com>

Author: rvokal

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

Modified Files:
	nuttcp.spec 
Log Message:
rebuilt


Index: nuttcp.spec
===================================================================
RCS file: /cvs/extras/rpms/nuttcp/devel/nuttcp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nuttcp.spec	28 Nov 2005 14:26:22 -0000	1.1
+++ nuttcp.spec	8 Feb 2006 15:10:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name: nuttcp
 Version: 5.1.11
-Release: 4
+Release: 5
 # upstream doesn't provide a tarball
 Source0: %{name}-%{version}.tar.bz2
 URL: ftp://ftp.lcp.nrl.navy.mil/pub/nuttcp/
@@ -50,6 +50,9 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 
 %changelog
+* Wed Feb 08 2006 Radek Vok??l  - 5.1.11-5
+- rebuilt
+
 * Mon Nov 28 2005 Radek Vokal  - 5.1.11-4
 - remove debuglist files from tarball
 - make gcc happier, warnings clean-up



From fedora-extras-commits at redhat.com  Wed Feb  8 15:33:53 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:33:53 -0500
Subject: rpms/easytag/devel easytag.spec,1.10,1.11
Message-ID: <200602081534.k18FYPdx004825@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	easytag.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- easytag.spec	8 Apr 2005 10:36:43 -0000	1.10
+++ easytag.spec	8 Feb 2006 15:33:53 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Tag editor for mp3, ogg, flac and other music files
 Name: easytag
 Version: 1.1
-Release: 1
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://easytag.sourceforge.net/
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1.1-2
+- Rebuild for new gcc/glibc.
+
 * Fri Apr  8 2005 Matthias Saou  1.1-1
 - Update to 1.1.
 - Remove yesterday's gcc4 patch, as it's no longer needed.



From fedora-extras-commits at redhat.com  Wed Feb  8 15:36:11 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:36:11 -0500
Subject: rpms/epydoc/devel epydoc.spec,1.4,1.5
Message-ID: <200602081536.k18FaimV004858@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	epydoc.spec 
Log Message:
Spec file cosmetic changes.



Index: epydoc.spec
===================================================================
RCS file: /cvs/extras/rpms/epydoc/devel/epydoc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- epydoc.spec	6 Apr 2005 22:11:37 -0000	1.4
+++ epydoc.spec	8 Feb 2006 15:36:11 -0000	1.5
@@ -4,7 +4,6 @@
 Name: epydoc
 Version: 2.1
 Release: 4
-
 Group: Development/Tools
 License: MIT
 URL: http://epydoc.sourceforge.net/
@@ -13,7 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: tkinter
-BuildRequires: python desktop-file-utils
+BuildRequires: python, desktop-file-utils
 BuildArch: noarch
 
 %description



From fedora-extras-commits at redhat.com  Wed Feb  8 15:46:13 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:46:13 -0500
Subject: rpms/fillets-ng/devel fillets-ng.spec,1.4,1.5
Message-ID: <200602081546.k18FkjO0005134@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fillets-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5054

Modified Files:
	fillets-ng.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: fillets-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fillets-ng.spec	11 Oct 2005 23:35:15 -0000	1.4
+++ fillets-ng.spec	8 Feb 2006 15:46:13 -0000	1.5
@@ -1,17 +1,17 @@
-Summary:        Fish Fillets Next Generation, a puzzle game with 70 levels
-Name:           fillets-ng
-Version:        0.7.3
-Release:        1%{?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
-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
+Summary: Fish Fillets Next Generation, a puzzle game with 70 levels
+Name: fillets-ng
+Version: 0.7.3
+Release: 2%{?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
+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
 
 %description
 Fish Fillets is strictly a puzzle game. The goal in every of the
@@ -37,9 +37,9 @@
 
 # Install desktop file
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor=fedora         \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE1}
+desktop-file-install --vendor=fedora \
+    --dir %{buildroot}%{_datadir}/applications \
+    %{SOURCE1}
 
 # Install themeable icon
 %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/fillets.png
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  0.7.3-2
+- Rebuild for new gcc/glibc.
+
 * Wed Oct 12 2005 Matthias Saou  0.7.3-1
 - Update to 0.7.3.
 - Enable fribidi support.



From fedora-extras-commits at redhat.com  Wed Feb  8 15:48:28 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:48:28 -0500
Subject: rpms/gcombust/devel gcombust.spec,1.8,1.9
Message-ID: <200602081549.k18Fn0LV005493@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gcombust.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: gcombust.spec
===================================================================
RCS file: /cvs/extras/rpms/gcombust/devel/gcombust.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gcombust.spec	9 May 2005 11:23:26 -0000	1.8
+++ gcombust.spec	8 Feb 2006 15:48:27 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Powerful GTK+ front-end for mkisofs and cdrecord
 Name: gcombust
 Version: 0.1.55
-Release: 6
+Release: 7
 Epoch: 1
 License: GPL
 Group: Applications/Archiving
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1:0.1.55-7
+- Rebuild for new gcc/glibc.
+
 * Mon May  9 2005 Matthias Saou  1:0.1.55-6
 - Added gcc4 patch from Michael.
 



From fedora-extras-commits at redhat.com  Wed Feb  8 15:51:08 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:51:08 -0500
Subject: rpms/gentoo/devel gentoo.spec,1.4,1.5
Message-ID: <200602081551.k18FpeP0005988@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gentoo.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: gentoo.spec
===================================================================
RCS file: /cvs/extras/rpms/gentoo/devel/gentoo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gentoo.spec	6 Jun 2005 09:06:45 -0000	1.4
+++ gentoo.spec	8 Feb 2006 15:51:08 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Graphical file management program in GTK+ for Linux
 Name: gentoo
 Version: 0.11.55
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/File
 URL: http://www.obsession.se/gentoo/
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  0.11.55-2
+- Rebuild for new gcc/glibc.
+
 * Mon Jun  6 2005 Matthias Saou  0.11.55-1
 - Update to 0.11.55.
 - Replace gnome-db-icon.png used until now with included gentoo.png.



From fedora-extras-commits at redhat.com  Wed Feb  8 15:53:01 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:53:01 -0500
Subject: rpms/giblib/devel giblib.spec,1.8,1.9
Message-ID: <200602081553.k18FrXah006317@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	giblib.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: giblib.spec
===================================================================
RCS file: /cvs/extras/rpms/giblib/devel/giblib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- giblib.spec	23 Jan 2006 17:40:35 -0000	1.8
+++ giblib.spec	8 Feb 2006 15:53:01 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Simple library and a wrapper for imlib2
 Name: giblib
 Version: 1.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://linuxbrit.co.uk/giblib/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1.2.4-5
+- Rebuild for new gcc/glibc.
+
 * Mon Jan 23 2006 Matthias Saou  1.2.4-4
 - Rebuilt for FC5.
 - Switch back /sbin/ldconfig calls to use -p.



From fedora-extras-commits at redhat.com  Wed Feb  8 15:55:08 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 10:55:08 -0500
Subject: rpms/gkrellm-aclock/devel gkrellm-aclock.spec,1.2,1.3
Message-ID: <200602081555.k18FteGq006683@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-aclock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6578

Modified Files:
	gkrellm-aclock.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: gkrellm-aclock.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-aclock/devel/gkrellm-aclock.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gkrellm-aclock.spec	16 Aug 2005 23:24:42 -0000	1.2
+++ gkrellm-aclock.spec	8 Feb 2006 15:55:08 -0000	1.3
@@ -1,9 +1,9 @@
-%define gkplugindir	%{_libdir}/gkrellm2/plugins
+%define gkplugindir %{_libdir}/gkrellm2/plugins
 
 Summary: Analog clock plugin for GKrellM
 Name: gkrellm-aclock
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.geocities.com/m_muthukumar/gkrellaclock.html
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  0.3.3-3
+- Rebuild for new gcc/glibc.
+
 * Wed Aug 17 2005 Matthias Saou  0.3.3-2
 - Rebuild against new libcairo.
 



From fedora-extras-commits at redhat.com  Wed Feb  8 16:00:28 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 11:00:28 -0500
Subject: rpms/gkrellm-freq/devel .cvsignore, 1.2, 1.3 gkrellm-freq.spec, 1.2,
	1.3 sources, 1.2, 1.3 gkfreq-0.1.1-rmasm.patch, 1.1, NONE
Message-ID: <200602081601.k18G10LP007486@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-freq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7351

Modified Files:
	.cvsignore gkrellm-freq.spec sources 
Removed Files:
	gkfreq-0.1.1-rmasm.patch 
Log Message:
Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-freq/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jul 2005 07:57:03 -0000	1.2
+++ .cvsignore	8 Feb 2006 16:00:28 -0000	1.3
@@ -1 +1 @@
-gkfreq-0.1.1.tar.gz
+gkrellm-gkfreq-1.0.tar.gz


Index: gkrellm-freq.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-freq/devel/gkrellm-freq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gkrellm-freq.spec	15 Jul 2005 14:20:27 -0000	1.2
+++ gkrellm-freq.spec	8 Feb 2006 16:00:28 -0000	1.3
@@ -1,14 +1,14 @@
-%define gkplugindir	%{_libdir}/gkrellm2/plugins
+%define gkplugindir %{_libdir}/gkrellm2/plugins
 
 Summary: CPU frequency display plugin for GKrellM
 Name: gkrellm-freq
-Version: 0.1.1
-Release: 2%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.peakunix.net/gkfreq/
-Source: http://www.peakunix.net/downloads/gkfreq-%{version}.tar.gz
-Patch: gkfreq-0.1.1-rmasm.patch
+Source: http://www.peakunix.net/downloads/gkrellm-gkfreq-%{version}.tar.gz
+Patch: gkrellm-gkfreq-1.0-rmasm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gkrellm >= 2.2.0
 BuildRequires: gkrellm-devel >= 2.2.0
@@ -19,7 +19,7 @@
 
 
 %prep
-%setup -n gkfreq-%{version}
+%setup -n gkrellm-gkfreq-%{version}
 %patch -p1 -b .noasm
 
 
@@ -46,6 +46,11 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1.0-1
+- Update to 1.0.
+- Update the rmasm patch.
+- Update original name from gkfreq to gkrellm-gkfreq.
+
 * Fri Jul 15 2005 Matthias Saou  0.1.1-2
 - Include patch to remove unused function containing an asm call that made
   build fail on PPC.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-freq/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jul 2005 07:57:03 -0000	1.2
+++ sources	8 Feb 2006 16:00:28 -0000	1.3
@@ -1 +1 @@
-d4186d02a9fbc55bbf1854399e78946a  gkfreq-0.1.1.tar.gz
+84bd000f93b5c98e0e731ff9f5475064  gkrellm-gkfreq-1.0.tar.gz


--- gkfreq-0.1.1-rmasm.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Feb  8 16:09:00 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 11:09:00 -0500
Subject: rpms/gkrellm-freq/devel gkrellm-gkfreq-1.0-rmasm.patch,NONE,1.1
Message-ID: <200602081609.k18G92qX009368@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/gkrellm-freq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9356

Added Files:
	gkrellm-gkfreq-1.0-rmasm.patch 
Log Message:
Add missing updated patch.


gkrellm-gkfreq-1.0-rmasm.patch:

--- NEW FILE gkrellm-gkfreq-1.0-rmasm.patch ---
diff -Naupr gkrellm-gkfreq-1.0.orig/gkfreq.c gkrellm-gkfreq-1.0/gkfreq.c
--- gkrellm-gkfreq-1.0.orig/gkfreq.c	2005-08-11 18:53:22.000000000 +0200
+++ gkrellm-gkfreq-1.0/gkfreq.c	2006-02-08 16:57:05.000000000 +0100
@@ -20,13 +20,6 @@ static GkrellmDecal	*decal_text1;
 static gint	style_id;
 
 
-__inline__ unsigned long long int rdtsc()
-{
-	unsigned long long int x;
-	__asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
-	return x;
-}
-
 static
 void read_MHz(char* buffer_, size_t bufsz_)
 {



From fedora-extras-commits at redhat.com  Wed Feb  8 16:29:24 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  8 Feb 2006 11:29:24 -0500
Subject: rpms/Gtk-Perl/devel Gtk-Perl.spec,1.3,1.4
Message-ID: <200602081629.k18GTuBb009595@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/Gtk-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9559

Modified Files:
	Gtk-Perl.spec 
Log Message:
Add modular X conditionnal and rebuild for new gcc/glibc.



Index: Gtk-Perl.spec
===================================================================
RCS file: /cvs/extras/rpms/Gtk-Perl/devel/Gtk-Perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Gtk-Perl.spec	6 Apr 2005 22:10:46 -0000	1.3
+++ Gtk-Perl.spec	8 Feb 2006 16:29:23 -0000	1.4
@@ -3,8 +3,7 @@
 Summary: Perl extensions for GTK+ (the Gimp ToolKit)
 Name: Gtk-Perl
 Version: 0.7008
-Release: 38
-
+Release: 39%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gtkperl.org/
@@ -12,8 +11,13 @@
 Source10: filter-depends.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk+-devel, gdk-pixbuf-devel, libglade-devel
-BuildRequires: gnome-libs-devel, Mesa-devel
-BuildRequires: gtkhtml-devel, gal-devel, perl-XML-Parser
+BuildRequires: gnome-libs-devel, gtkhtml-devel, gal-devel
+BuildRequires: perl(XML::Parser)
+%if 0%{?fedora} < 5
+BuildRequires: Mesa-devel
+%else
+BuildRequires: mesa-libGL-devel, libXt-devel, libXpm-devel
+%endif
 
 # Internal perl provides not caught by the find-provides
 Provides: perl(Gnome::Applet::Types)
@@ -88,14 +92,18 @@
 %doc ChangeLog NOTES README VERSIONS
 %{_libdir}/perl5/vendor_perl/*/*-linux*/Gnome/
 %{_libdir}/perl5/vendor_perl/*/*-linux*/Gtk/
-%{_libdir}/perl5/vendor_perl/*/*-linux*/Gtk.pm
 %{_libdir}/perl5/vendor_perl/*/*-linux*/Gnome.pm
+%{_libdir}/perl5/vendor_perl/*/*-linux*/Gtk.pm
 %{_libdir}/perl5/vendor_perl/*/*-linux*/auto/Gnome/
 %{_libdir}/perl5/vendor_perl/*/*-linux*/auto/Gtk/
 %{_mandir}/man?/*
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  0.7008-39
+- Rebuild for new gcc/glibc.
+- Add conditional to build with/without modular X depending on FC version.
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Feb  8 16:51:14 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  8 Feb 2006 11:51:14 -0500
Subject: rpms/scribus/FC-3 scribus.spec,1.10,1.11
Message-ID: <200602081651.k18GpltM009748@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	scribus.spec 
Log Message:
- add missing requires python-imaging



Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-3/scribus.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scribus.spec	19 Jan 2006 08:19:23 -0000	1.10
+++ scribus.spec	8 Feb 2006 16:51:14 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
@@ -9,7 +9,6 @@
 Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
-#Patch0:        scribus-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -28,6 +27,7 @@
 BuildRequires:  freetype-devel
 Requires:       ghostscript >= 7.07
 Requires:       python >= 2.3
+Requires:       python-imaging
 Requires:       tkinter
 Requires(post): shared-mime-info
 Requires(post): desktop-file-utils
@@ -135,8 +135,12 @@
 
 
 %changelog
+* Wed Feb 08 2006 Andreas Bierfert 
+1.2.4.1-2
+ - add missing requires python-imaging
+
 * Wed Jan 18 2006 Andreas Bierfert 
-1.2.4.1
+1.2.4.1-1
 - version upgrade
 
 * Thu Jul 7 2005 Tom "spot" Callaway  1.2.2.1-2



From fedora-extras-commits at redhat.com  Wed Feb  8 16:51:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  8 Feb 2006 11:51:20 -0500
Subject: rpms/scribus/FC-4 scribus.spec,1.16,1.17
Message-ID: <200602081651.k18Gpq23009752@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	scribus.spec 
Log Message:
- add missing requires python-imaging



Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scribus.spec	21 Jan 2006 08:43:42 -0000	1.16
+++ scribus.spec	8 Feb 2006 16:51:20 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.2.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -10,7 +10,6 @@
 Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
-#Patch0:         scribus-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -29,6 +28,7 @@
 BuildRequires:  freetype-devel
 Requires:       ghostscript >= 7.07
 Requires:       python >= 2.3
+Requires:       python-imaging
 Requires:       tkinter
 Requires(post): shared-mime-info
 Requires(post): desktop-file-utils
@@ -136,6 +136,10 @@
 
 
 %changelog
+* Wed Feb 08 2006 Andreas Bierfert 
+1.2.4.1-3
+- add missing requires python-imaging
+
 * Sat Jan 21 2006 Andreas Bierfert 
 1.2.4.1-2
 - rebuild (#178494)



From fedora-extras-commits at redhat.com  Wed Feb  8 16:51:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed,  8 Feb 2006 11:51:26 -0500
Subject: rpms/scribus/devel scribus.spec,1.13,1.14
Message-ID: <200602081651.k18GpwDI009756@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	scribus.spec 
Log Message:
- add missing requires python-imaging



Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scribus.spec	19 Jan 2006 08:19:35 -0000	1.13
+++ scribus.spec	8 Feb 2006 16:51:26 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.2.4.1
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -10,7 +10,6 @@
 Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
-#Patch0:         scribus-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -29,6 +28,7 @@
 BuildRequires:  freetype-devel
 Requires:       ghostscript >= 7.07
 Requires:       python >= 2.3
+Requires:       python-imaging
 Requires:       tkinter
 Requires(post): shared-mime-info
 Requires(post): desktop-file-utils
@@ -136,8 +136,16 @@
 
 
 %changelog
+* Wed Feb 08 2006 Andreas Bierfert 
+1.2.4.1-3
+- add missing requires python-imaging
+
+* Sat Jan 21 2006 Andreas Bierfert 
+1.2.4.1-2
+- rebuild (#178494)
+
 * Wed Jan 18 2006 Andreas Bierfert 
-1.2.4.1
+1.2.4.1-1
 - version upgrade
 
 * Thu Jul 7 2005 Tom "spot" Callaway  1.2.2.1-2



From fedora-extras-commits at redhat.com  Wed Feb  8 16:55:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  8 Feb 2006 11:55:39 -0500
Subject: rpms/bash-completion/devel bash-completion.profile, 1.3,
	1.4 bash-completion.spec, 1.14, 1.15
Message-ID: <200602081656.k18GuBDD009925@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	bash-completion.profile bash-completion.spec 
Log Message:
* Wed Feb  8 2006 Ville Skytt??  - 20050721-4
- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.



Index: bash-completion.profile
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.profile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bash-completion.profile	28 Nov 2005 20:26:32 -0000	1.3
+++ bash-completion.profile	8 Feb 2006 16:55:38 -0000	1.4
@@ -1,6 +1,9 @@
 # check for bash (and that we haven't already been sourced, see eg. #174355)
 [ -z "$BASH_VERSION" -o -n "$BASH_COMPLETION" ] && return
 
+# skip non-interactive shells
+[[ $- == *i* ]] || return
+
 # check for correct version of bash
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
 if [ -r /etc/bash_completion ] && \


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bash-completion.spec	4 Feb 2006 19:11:14 -0000	1.14
+++ bash-completion.spec	8 Feb 2006 16:55:38 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050721
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -69,15 +69,21 @@
 
 %bashcomp_trigger bittorrent
 %bashcomp_trigger cksfv
+%bashcomp_trigger clisp
 %bashcomp_trigger freeciv
+%bashcomp_trigger gcc-gnat gnatmake
 %bashcomp_trigger gkrellm
 %bashcomp_trigger mailman
 %bashcomp_trigger mcrypt
 %bashcomp_trigger mock
 %bashcomp_trigger mtx
 %bashcomp_trigger plague-client
+%bashcomp_trigger ruby-ri ri
+%bashcomp_trigger sbcl
+%bashcomp_trigger snownews
 %bashcomp_trigger subversion
 %bashcomp_trigger unace
+%bashcomp_trigger unixODBC isql
 %bashcomp_trigger unrar
 %bashcomp_trigger yum-utils repomanage
 
@@ -92,6 +98,10 @@
 
 
 %changelog
+* Wed Feb  8 2006 Ville Skytt??  - 20050721-4
+- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
+- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.
+
 * Sat Feb  4 2006 Ville Skytt?? 
 - Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).
 



From fedora-extras-commits at redhat.com  Wed Feb  8 17:23:07 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:23:07 -0500
Subject: rpms/sblim-testsuite - New directory
Message-ID: <200602081723.k18HN9Ud011939@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-testsuite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11931/sblim-testsuite

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




From fedora-extras-commits at redhat.com  Wed Feb  8 17:23:12 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:23:12 -0500
Subject: rpms/sblim-testsuite/devel - New directory
Message-ID: <200602081723.k18HNFdJ011956@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-testsuite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11931/sblim-testsuite/devel

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




From fedora-extras-commits at redhat.com  Wed Feb  8 17:23:28 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:23:28 -0500
Subject: rpms/sblim-testsuite Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602081723.k18HNU2R011992@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-testsuite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11980

Added Files:
	Makefile import.log 
Log Message:
Setup of module sblim-testsuite


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb  8 17:23:34 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:23:34 -0500
Subject: rpms/sblim-testsuite/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602081723.k18HNaJX012012@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-testsuite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11980/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-testsuite


--- NEW 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 Feb  8 17:24:24 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:24:24 -0500
Subject: rpms/sblim-testsuite import.log,1.1,1.2
Message-ID: <200602081724.k18HOudZ012089@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-testsuite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12049

Modified Files:
	import.log 
Log Message:
auto-import sblim-testsuite-1.2.4-1 on branch devel from sblim-testsuite-1.2.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sblim-testsuite/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Feb 2006 17:23:28 -0000	1.1
+++ import.log	8 Feb 2006 17:24:23 -0000	1.2
@@ -0,0 +1 @@
+sblim-testsuite-1_2_4-1:HEAD:sblim-testsuite-1.2.4-1.src.rpm:1139419361



From fedora-extras-commits at redhat.com  Wed Feb  8 17:24:29 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:24:29 -0500
Subject: rpms/sblim-testsuite/devel sblim-testsuite.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602081725.k18HP2DV012093@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-testsuite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12049/devel

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


--- NEW FILE sblim-testsuite.spec ---
#
# $Id: sblim-testsuite.spec.in,v 1.3 2005/10/28 13:26:02 mihajlov Exp $
#
# Package spec for sblim-testsuite
#

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Summary: SBLIM testsuite
Name: sblim-testsuite
Version: 1.2.4
Release: 1
Group: Systems Management/Base
URL: http://www.sourceforge.net
License: CPL

Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2

Requires: perl >= 5.6
Requires: sblim-wbemcli >= 1.5

%Description
SBLIM automated testsuite scripts

%prep

%setup

%build

%configure
make

%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_localstatedir}/lib/%{name}

%changelog

* Thu Oct 28 2005 Viktor Mihajlovski  1.2.4-1
  - New release

* Thu Jul 28 2005 Viktor Mihajlovski  1.2.3-0
  - Updates for rpmlint complaints


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-testsuite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Feb 2006 17:23:34 -0000	1.1
+++ .cvsignore	8 Feb 2006 17:24:29 -0000	1.2
@@ -0,0 +1 @@
+sblim-testsuite-1.2.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-testsuite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Feb 2006 17:23:34 -0000	1.1
+++ sources	8 Feb 2006 17:24:29 -0000	1.2
@@ -0,0 +1 @@
+869d2c2f13181aee58aabd7aeb35f72d  sblim-testsuite-1.2.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Feb  8 17:28:32 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:28:32 -0500
Subject: owners owners.list,1.622,1.623
Message-ID: <200602081729.k18HT4n0012149@cvs-int.fedora.redhat.com>

Author: hamzy

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

Modified Files:
	owners.list 
Log Message:
added sblim-wbemcli



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.622
retrieving revision 1.623
diff -u -r1.622 -r1.623
--- owners.list	8 Feb 2006 14:49:57 -0000	1.622
+++ owners.list	8 Feb 2006 17:28:31 -0000	1.623
@@ -1160,6 +1160,7 @@
 Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-cmpi-base|Standards Based Linux Instrumentation Base CMPI Providers for System-related CIM classes|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
+Fedora Extras|sblim-wbemcli|WBEM Command Line Interface is a standalone, command line WBEM client|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Feb  8 17:32:34 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:32:34 -0500
Subject: rpms/sblim-wbemcli - New directory
Message-ID: <200602081732.k18HWa1C012214@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-wbemcli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12206/sblim-wbemcli

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




From fedora-extras-commits at redhat.com  Wed Feb  8 17:32:40 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:32:40 -0500
Subject: rpms/sblim-wbemcli/devel - New directory
Message-ID: <200602081732.k18HWgRw012229@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-wbemcli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12206/sblim-wbemcli/devel

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




From fedora-extras-commits at redhat.com  Wed Feb  8 17:32:59 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:32:59 -0500
Subject: rpms/sblim-wbemcli Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602081733.k18HX1Jj012263@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-wbemcli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12251

Added Files:
	Makefile import.log 
Log Message:
Setup of module sblim-wbemcli


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb  8 17:33:04 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:33:04 -0500
Subject: rpms/sblim-wbemcli/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602081733.k18HX6Y7012283@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-wbemcli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12251/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-wbemcli


--- NEW 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 Feb  8 17:33:25 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:33:25 -0500
Subject: rpms/sblim-wbemcli import.log,1.1,1.2
Message-ID: <200602081733.k18HXvhq012353@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-wbemcli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12317

Modified Files:
	import.log 
Log Message:
auto-import sblim-wbemcli-1.5.1-1 on branch devel from sblim-wbemcli-1.5.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Feb 2006 17:32:58 -0000	1.1
+++ import.log	8 Feb 2006 17:33:24 -0000	1.2
@@ -0,0 +1 @@
+sblim-wbemcli-1_5_1-1:HEAD:sblim-wbemcli-1.5.1-1.src.rpm:1139419924



From fedora-extras-commits at redhat.com  Wed Feb  8 17:33:30 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:33:30 -0500
Subject: rpms/sblim-wbemcli/devel sblim-wbemcli.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602081734.k18HY332012357@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-wbemcli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12317/devel

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


--- NEW FILE sblim-wbemcli.spec ---
#
# $Id: sblim-wbemcli.spec.in,v 1.5 2005/10/28 13:28:51 mihajlov Exp $
#
# Package spec for wbemcli (RH version)
#

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Summary: SBLIM WBEM Command Line Interface
Name: sblim-wbemcli
Version: 1.5.1
Release: 1
Group: Systems Management/Base
URL: http://www.sblim.org
License: CPL

Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2

BuildRequires: curl-devel >= 7.9.3
Requires: curl >= 7.9.3

%Description
WBEM Command Line Interface is a standalone, command line WBEM client. It is
specially suited for basic systems management tasks as it can be used in
scripts.

%prep
%setup

%build
%configure CACERT=/etc/Pegasus/client.pem
make %{?smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_bindir}/wbem*
%{_mandir}/man1/*
%{_datadir}/%{name}

%changelog

* Mon Nov 21 2005 Viktor Mihajlovski  1.5.1-1
  - Upgrade to version 1.5.1 (SSL V3 enforced, default CACERT).
    Created Fedora/RH specific spec file.

* Thu Oct 28 2005 Viktor Mihajlovski  1.5.0-1
  - Minor enhancements for Fedora compatibility, still not daring to
    nuke the build root though

* Thu Jul 28 2005 Viktor Mihajlovski  1.5.0-0
  - Updates for rpmlint complaints


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Feb 2006 17:33:04 -0000	1.1
+++ .cvsignore	8 Feb 2006 17:33:30 -0000	1.2
@@ -0,0 +1 @@
+sblim-wbemcli-1.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Feb 2006 17:33:04 -0000	1.1
+++ sources	8 Feb 2006 17:33:30 -0000	1.2
@@ -0,0 +1 @@
+2d048b0ebd0f6b34993e49a28ebda794  sblim-wbemcli-1.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Feb  8 17:35:41 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:35:41 -0500
Subject: owners owners.list,1.623,1.624
Message-ID: <200602081736.k18HaE1b012417@cvs-int.fedora.redhat.com>

Author: hamzy

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

Modified Files:
	owners.list 
Log Message:
added sblim-testsuite



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- owners.list	8 Feb 2006 17:28:31 -0000	1.623
+++ owners.list	8 Feb 2006 17:35:41 -0000	1.624
@@ -1160,6 +1160,7 @@
 Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-cmpi-base|Standards Based Linux Instrumentation Base CMPI Providers for System-related CIM classes|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
+Fedora Extras|sblim-testsuite|SBLIM automated testsuite scripts|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-wbemcli|WBEM Command Line Interface is a standalone, command line WBEM client|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Feb  8 17:39:15 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:39:15 -0500
Subject: rpms/sblim-wbemcli/devel sblim-wbemcli.spec,1.1,1.2
Message-ID: <200602081739.k18HdlR5012452@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-wbemcli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12435

Modified Files:
	sblim-wbemcli.spec 
Log Message:
Updated version number



Index: sblim-wbemcli.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/devel/sblim-wbemcli.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sblim-wbemcli.spec	8 Feb 2006 17:33:30 -0000	1.1
+++ sblim-wbemcli.spec	8 Feb 2006 17:39:15 -0000	1.2
@@ -9,7 +9,7 @@
 Summary: SBLIM WBEM Command Line Interface
 Name: sblim-wbemcli
 Version: 1.5.1
-Release: 1
+Release: 1.fc5
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL



From fedora-extras-commits at redhat.com  Wed Feb  8 17:41:39 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Wed,  8 Feb 2006 12:41:39 -0500
Subject: rpms/sblim-testsuite/devel sblim-testsuite.spec,1.1,1.2
Message-ID: <200602081742.k18HgBxN012517@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-testsuite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12500

Modified Files:
	sblim-testsuite.spec 
Log Message:
updating version number



Index: sblim-testsuite.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-testsuite/devel/sblim-testsuite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sblim-testsuite.spec	8 Feb 2006 17:24:29 -0000	1.1
+++ sblim-testsuite.spec	8 Feb 2006 17:41:39 -0000	1.2
@@ -10,7 +10,7 @@
 Summary: SBLIM testsuite
 Name: sblim-testsuite
 Version: 1.2.4
-Release: 1
+Release: 1.fc5
 Group: Systems Management/Base
 URL: http://www.sourceforge.net
 License: CPL



From fedora-extras-commits at redhat.com  Wed Feb  8 18:28:14 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed,  8 Feb 2006 13:28:14 -0500
Subject: rpms/shorewall/FC-4 shorewall-3.0.3-init.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 shorewall.spec, 1.11, 1.12 sources, 1.4,
	1.5 shorewall-2.4.4-init.patch, 1.1, NONE
Message-ID: <200602081828.k18ISkR4014540@cvs-int.fedora.redhat.com>

Author: robmv

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

Modified Files:
	.cvsignore shorewall.spec sources 
Added Files:
	shorewall-3.0.3-init.patch 
Removed Files:
	shorewall-2.4.4-init.patch 
Log Message:
Update to 3.0.x using devel branch


shorewall-3.0.3-init.patch:

--- NEW FILE shorewall-3.0.3-init.patch ---
diff -Naur shorewall-3.0.3.original/init.sh shorewall-3.0.3/init.sh
--- shorewall-3.0.3.original/init.sh	2005-12-07 18:03:44.000000000 -0400
+++ shorewall-3.0.3/init.sh	2006-01-03 15:18:33.000000000 -0400
@@ -36,15 +36,15 @@
 #	   shorewall status			  Displays firewall status
 #
 
-# chkconfig: 2345 25 90
+# chkconfig: - 25 90
 # description: Packet filtering firewall
 
 ### BEGIN INIT INFO
 # Provides:	  shorewall
 # Required-Start: $network
 # Required-Stop:
-# Default-Start:  2 3 5
-# Default-Stop:	  0 1 6
+# Default-Start:
+# Default-Stop:	  0 1 2 3 4 5 6
 # Description:	  starts and stops the shorewall firewall
 ### END INIT INFO
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Oct 2005 17:17:34 -0000	1.4
+++ .cvsignore	8 Feb 2006 18:28:13 -0000	1.5
@@ -1 +1 @@
-shorewall-2.4.6.tar.bz2
+shorewall-3.0.4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- shorewall.spec	31 Oct 2005 17:17:34 -0000	1.11
+++ shorewall.spec	8 Feb 2006 18:28:13 -0000	1.12
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 2.4.6
+Version: 3.0.4
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -7,8 +7,8 @@
 Group: Applications/System
 License: GPL
 URL: http://www.shorewall.net/
-Source: http://www.shorewall.net/pub/shorewall/2.4/shorewall-%{version}/shorewall-%{version}.tar.bz2
-Patch0: shorewall-2.4.4-init.patch
+Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2
+Patch0: shorewall-3.0.3-init.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,7 +36,7 @@
 ./install.sh
 # Create %ghost files
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall
-touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail}
+touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail,state}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,10 +64,11 @@
 
 %{_datadir}/shorewall/action.*
 %{_datadir}/shorewall/actions.std
-%{_datadir}/shorewall/bogons
 %{_datadir}/shorewall/configpath
+%{_datadir}/shorewall/macro.*
 %{_datadir}/shorewall/rfc1918
 %{_datadir}/shorewall/version
+%{_datadir}/shorewall/Limit
 
 %attr(0754,root,root) %{_datadir}/shorewall/firewall
 %attr(0754,root,root) %{_datadir}/shorewall/functions
@@ -76,11 +77,32 @@
 %attr(0700,root,root) %dir %{_localstatedir}/lib/shorewall
 %attr(0600,root,root) %ghost %{_localstatedir}/lib/shorewall/*
 %attr(0750,root,root) /sbin/shorewall
-%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel README.txt
+%doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
-* Mon Oct 31 2005 Robert Marcano  - 2.4.6-1
-- Update to upstream version 2.4.6, package README.txt as a doc file
+* Thu Jan 12 2006 Robert Marcano  - 3.0.4-1
+- Update to upstream 3.0.4
+
+* Tue Jan 03 2006 Robert Marcano  - 3.0.3-1
+- Update to upstream 3.0.3
+
+* Sun Nov 27 2005 Robert Marcano  - 3.0.2-1
+- Update to upstream 3.0.2
+
+* Fri Nov 11 2005 Robert Marcano  - 3.0.0-1
+- Update to final 3.0.0 release
+
+* Thu Nov 03 2005 Robert Marcano  - 3.0.0-0.3.RC3
+- Update to upstream 3.0.0-RC3. Samples added to the doc directory
+
+* Sun Oct 23 2005 Robert Marcano  - 3.0.0-0.3.RC2
+- Update to upstream 3.0.0-RC2
+
+* Thu Oct 17 2005 Robert Marcano  - 3.0.0-0.2.RC1
+- Update to upstream 3.0.0-RC1
+
+* Thu Oct 14 2005 Robert Marcano  - 3.0.0-0.1.Beta1
+- Update to upstream 3.0.0-Beta1, package README.txt as a documentation file
 
 * Sat Oct 08 2005 Robert Marcano  - 2.4.5-1
 - Update to upstream version 2.4.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Oct 2005 17:17:34 -0000	1.4
+++ sources	8 Feb 2006 18:28:13 -0000	1.5
@@ -1 +1 @@
-c90eabfb128563766e0899429538947c  shorewall-2.4.6.tar.bz2
+2745e8e5c2143c3d9f5836b964c67721  shorewall-3.0.4.tar.bz2


--- shorewall-2.4.4-init.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Feb  8 18:58:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  8 Feb 2006 13:58:01 -0500
Subject: fedora-rpmdevtools fedora-diffarchive, 1.2,
	1.3 fedora-rpmdevtools.spec, 1.87, 1.88
Message-ID: <200602081858.k18Iw1SG014765@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	fedora-diffarchive fedora-rpmdevtools.spec 
Log Message:
* Wed Feb  8 2006 Ville Skytt?? 
- Add "diff file lists only" option to diffarchive.



Index: fedora-diffarchive
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-diffarchive,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-diffarchive	15 Mar 2005 12:42:05 -0000	1.2
+++ fedora-diffarchive	8 Feb 2006 18:57:53 -0000	1.3
@@ -13,6 +13,7 @@
 unset CDPATH
 tmpdir=
 diffopts=
+list=
 
 trap cleanup EXIT
 cleanup()
@@ -24,7 +25,8 @@
 usage()
 {
     cat < "$old.files"
+    find "$new" | sort | cut -d/ -f 2- -s > "$new.files"
+    diff $diffopts "$old.files" "$new.files"
+else
+    diff $diffopts "$old" "$new"
+fi


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- fedora-rpmdevtools.spec	5 Feb 2006 14:05:34 -0000	1.87
+++ fedora-rpmdevtools.spec	8 Feb 2006 18:57:53 -0000	1.88
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Wed Feb  8 2006 Ville Skytt?? 
+- Add "diff file lists only" option to diffarchive.
+
 * Sun Feb  5 2006 Ville Skytt?? 
 - Add Ruby spec template (#180066, Oliver Andrich) and make newrpmspec
   use it for ruby-*.



From fedora-extras-commits at redhat.com  Wed Feb  8 20:53:02 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed,  8 Feb 2006 15:53:02 -0500
Subject: fedora-security/audit fc4,1.148,1.149 fc5,1.57,1.58
Message-ID: <200602082053.k18Kr2li018677@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	fc4 fc5 
Log Message:
Note the new pgcrypt issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- fc4	8 Feb 2006 11:31:29 -0000	1.148
+++ fc4	8 Feb 2006 20:52:53 -0000	1.149
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-0591 VULNERABLE (postgresql)
 CVE-2006-0528 **evolution
 CVE-2006-0496 VULNERABLE (mozilla)
 CVE-2006-0496 VULNERABLE (firefox)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- fc5	8 Feb 2006 11:31:29 -0000	1.57
+++ fc5	8 Feb 2006 20:52:53 -0000	1.58
@@ -15,6 +15,7 @@
 
 ** are items that need attention
 
+CVE-2006-0591 VULNERABLE (postgresql)
 CVE-2006-0528 ** evolution [under investigation]
 CVE-2006-0496 VULNERABLE (mozilla) not fixed upstream
 CVE-2006-0496 VULNERABLE (firefox) not fixed upstream



From fedora-extras-commits at redhat.com  Wed Feb  8 21:42:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed,  8 Feb 2006 16:42:05 -0500
Subject: rpms/scorched3d/devel scorched3d-64bit.patch,1.2,1.3
Message-ID: <200602082142.k18LgbC6020720@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	scorched3d-64bit.patch 
Log Message:
final? version of scorched3d 64bit fixes, these work, hurray!

scorched3d-64bit.patch:

Index: scorched3d-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-64bit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scorched3d-64bit.patch	7 Feb 2006 21:07:38 -0000	1.2
+++ scorched3d-64bit.patch	8 Feb 2006 21:42:04 -0000	1.3
@@ -1,6 +1,32 @@
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/GLEXT/GLTexture.cpp scorched/src/GLEXT/GLTexture.cpp
+--- scorched.orig/src/GLEXT/GLTexture.cpp	2005-06-05 23:54:01.000000000 +0200
++++ scorched/src/GLEXT/GLTexture.cpp	2006-02-08 20:35:07.000000000 +0100
+@@ -119,7 +119,7 @@
+ 		if (height == 1 || width == 1) texType_ = GL_TEXTURE_1D;
+ 		else texType_ = GL_TEXTURE_2D;
+ 
+-		if (!textureValid())
++		if (!texNum_ || !textureValid())
+ 		{
+ 			GLfloat priority = 1.0f;
+ 			glGenTextures(1, &texNum_);
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/client/ClientConnectionAcceptHandler.cpp scorched/src/client/ClientConnectionAcceptHandler.cpp
+--- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp	2006-02-06 22:37:12.000000000 +0100
++++ scorched/src/client/ClientConnectionAcceptHandler.cpp	2006-02-08 21:14:07.000000000 +0100
+@@ -66,7 +66,9 @@
+ 
+ 	if (OptionsParam::instance()->getConnectedToServer())
+ 	{
+-		unsigned int ip = NetServer::getIpAddress((TCPsocket) id);
++		NetServer *netServer = (NetServer *)
++			ScorchedClient::instance()->getContext().netInterface;
++		unsigned int ip = netServer->getIpAddress(id);
+ 		if (!ConnectDialog::instance()->getIdStore().saveUniqueId(
+ 			ip, message.getUniqueId(), message.getPublishAddress()))
+ 		{
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
 --- scorched.orig/src/client/ServerBrowser.cpp	2003-10-21 18:58:11.000000000 +0200
-+++ scorched/src/client/ServerBrowser.cpp	2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/client/ServerBrowser.cpp	2006-02-07 20:41:25.000000000 +0100
 @@ -50,7 +50,7 @@
  
  int ServerBrowser::threadFunc(void *var)
@@ -12,7 +38,7 @@
  	else result = instance_->serverList_.fetchServerList();
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
 --- scorched.orig/src/coms/NetServer.cpp	2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServer.cpp	2006-02-07 20:25:49.000000000 +0100
++++ scorched/src/coms/NetServer.cpp	2006-02-07 20:41:25.000000000 +0100
 @@ -33,6 +33,7 @@
  {
  	sockSet_ = SDLNet_AllocSocketSet(1);
@@ -199,11 +225,16 @@
  }
  
  unsigned int NetServer::getIpAddress(TCPsocket destination)
-Only in scorched/src/coms: NetServer.cpp~
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServer.h scorched/src/coms/NetServer.h
 --- scorched.orig/src/coms/NetServer.h	2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServer.h	2006-02-07 20:26:01.000000000 +0100
-@@ -52,22 +52,24 @@
++++ scorched/src/coms/NetServer.h	2006-02-08 20:18:31.000000000 +0100
+@@ -47,27 +47,29 @@
+ 	virtual void sendMessage(NetBuffer &buffer, unsigned int destination);
+ 	void setSentNotification() { sentNotification_ = true; }
+ 
++	unsigned int getIpAddress(unsigned int destination);
+ 	static unsigned int getIpAddress(TCPsocket destination);
+ 
  protected:
  	NetServerProtocol *protocol_;
  	TCPsocket server_;
@@ -227,14 +258,12 @@
  	void addClient(TCPsocket client);
 -	void sendMessage(TCPsocket client, NetMessage *message);
 +	void sendMessage(unsigned int dest, NetMessage *message);
-+	unsigned int getIpAddress(unsigned int destination);
  
  private:
  
-Only in scorched/src/coms: NetServer.h~
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
 --- scorched.orig/src/coms/NetServerProtocol.cpp	2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/coms/NetServerProtocol.cpp	2006-02-07 20:15:39.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.cpp	2006-02-07 20:41:25.000000000 +0100
 @@ -40,7 +40,8 @@
  {
  }
@@ -364,10 +393,9 @@
  	netBuffer->getBuffer().reset();
  
  	// get the string buffer over the socket
-Only in scorched/src/coms: NetServerProtocol.cpp~
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerProtocol.h scorched/src/coms/NetServerProtocol.h
 --- scorched.orig/src/coms/NetServerProtocol.h	2005-06-08 19:29:38.000000000 +0200
-+++ scorched/src/coms/NetServerProtocol.h	2006-02-07 20:14:35.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.h	2006-02-07 20:41:25.000000000 +0100
 @@ -29,8 +29,10 @@
  	NetServerProtocol();
  	virtual ~NetServerProtocol();
@@ -433,10 +461,9 @@
  };
  
  #endif
-Only in scorched/src/coms: NetServerProtocol.h~
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
 --- scorched.orig/src/coms/NetServerRead.cpp	2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServerRead.cpp	2006-02-07 20:19:01.000000000 +0100
++++ scorched/src/coms/NetServerRead.cpp	2006-02-07 20:41:25.000000000 +0100
 @@ -26,11 +26,12 @@
  #include 
  
@@ -522,10 +549,9 @@
  					NetServer::getIpAddress(socket_));
  			messageHandler_->addMessage(notification);
  		}
-Only in scorched/src/coms: NetServerRead.cpp~
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerRead.h scorched/src/coms/NetServerRead.h
 --- scorched.orig/src/coms/NetServerRead.h	2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServerRead.h	2006-02-07 19:52:32.000000000 +0100
++++ scorched/src/coms/NetServerRead.h	2006-02-07 20:41:25.000000000 +0100
 @@ -28,6 +28,7 @@
  {
  public:
@@ -549,10 +575,9 @@
  	SDLNet_SocketSet sockSet_;
  	NetServerProtocol *protocol_;
  	NetMessageHandler *messageHandler_;
-Only in scorched/src/coms: NetServerRead.h~
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
 --- scorched.orig/src/dialogs/HelpButtonDialog.cpp	2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/dialogs/HelpButtonDialog.cpp	2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/dialogs/HelpButtonDialog.cpp	2006-02-07 20:41:25.000000000 +0100
 @@ -160,7 +160,7 @@
  
  void HelpButtonDialog::itemSelected(GLWSelectorEntry *entry, int position)
@@ -562,10 +587,9 @@
  	if (data != -1)
  	{
  		int volume = int(float(data) * 12.8f);
-Only in scorched/src/dialogs: HelpButtonDialog.cpp.64bit
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
 --- scorched.orig/src/engine/ScorchedCollisionHandler.cpp	2005-06-08 19:29:38.000000000 +0200
-+++ scorched/src/engine/ScorchedCollisionHandler.cpp	2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/engine/ScorchedCollisionHandler.cpp	2006-02-07 20:41:25.000000000 +0100
 @@ -93,7 +93,7 @@
  	}
  
@@ -584,10 +608,9 @@
  	ShotProjectile *shot = (ShotProjectile *) particleInfo->data;
  	shot->incLandedCounter();
  	Vector particlePositionV(
-Only in scorched/src/engine: ScorchedCollisionHandler.cpp.64bit
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/ode/config.h scorched/src/ode/config.h
 --- scorched.orig/src/ode/config.h	2004-11-02 10:20:35.000000000 +0100
-+++ scorched/src/ode/config.h	2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/ode/config.h	2006-02-07 20:41:25.000000000 +0100
 @@ -81,7 +81,7 @@
  /* an integer type that we can safely cast a pointer to and from without
   * loss of bits.
@@ -599,7 +622,7 @@
  /* if we're compiling on a pentium, we may need to know the clock rate so
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
 --- scorched.orig/src/scorched/SettingsDialog.cpp	2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/scorched/SettingsDialog.cpp	2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/scorched/SettingsDialog.cpp	2006-02-07 20:41:25.000000000 +0100
 @@ -748,44 +748,44 @@
  
  	// Env
@@ -668,9 +691,23 @@
  			SettingsMain::IDC_TEAMBALLANCE_CTRL->GetClientData(
  				SettingsMain::IDC_TEAMBALLANCE_CTRL->GetSelection()));			
  		context_.setTeams((int) SettingsMain::IDC_TEAMS_CTRL->GetSelection() + 1);
+diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/server/ServerConnectHandler.cpp scorched/src/server/ServerConnectHandler.cpp
+--- scorched.orig/src/server/ServerConnectHandler.cpp	2005-07-24 21:34:01.000000000 +0200
++++ scorched/src/server/ServerConnectHandler.cpp	2006-02-08 20:17:33.000000000 +0100
+@@ -87,7 +87,9 @@
+ 		}
+ 
+ 		// Get the ip address
+-		ipAddress = NetServer::getIpAddress((TCPsocket) destinationId);
++		NetServer *netServer = (NetServer *)
++			ScorchedServer::instance()->getContext().netInterface;
++		ipAddress = netServer->getIpAddress(destinationId);
+ 	}
+ 
+ 	// Decode the connect message
 diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
 --- scorched.orig/src/tankgraph/GLWTankTip.cpp	2005-06-11 18:53:41.000000000 +0200
-+++ scorched/src/tankgraph/GLWTankTip.cpp	2006-02-06 23:45:56.000000000 +0100
++++ scorched/src/tankgraph/GLWTankTip.cpp	2006-02-07 20:41:25.000000000 +0100
 @@ -66,7 +66,7 @@
  
  void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position)



From fedora-extras-commits at redhat.com  Wed Feb  8 22:32:44 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed,  8 Feb 2006 17:32:44 -0500
Subject: rpms/nautilus-actions/devel .cvsignore, 1.2,
	1.3 nautilus-actions.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200602082233.k18MXGI1022929@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22906

Modified Files:
	.cvsignore nautilus-actions.spec sources 
Log Message:
* Wed Feb 8 2006 Deji Akingunola  - 1.0-1
- New upstream version
- Do away with gconf schemas installation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Jan 2006 15:21:52 -0000	1.2
+++ .cvsignore	8 Feb 2006 22:32:43 -0000	1.3
@@ -1 +1 @@
-nautilus-actions-0.99.tar.gz
+nautilus-actions-1.0.tar.gz


Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-actions.spec	2 Jan 2006 23:04:15 -0000	1.2
+++ nautilus-actions.spec	8 Feb 2006 22:32:43 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
-Version: 0.99
-Release: 5%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -11,7 +11,6 @@
 BuildRequires: e2fsprogs-devel
 BuildRequires: desktop-file-utils
 Requires(pre): GConf2
-Requires(post): GConf2
 Requires(preun): GConf2
 
 %description
@@ -23,7 +22,8 @@
 %setup -q
 
 %build
-%configure --disable-schemas-install --enable-commandline-tool
+%configure --disable-schemas-install --enable-commandline-tool \
+           --with-nautilus-extdir=%{_libdir}/nautilus/extensions-1.0
 make %{?_smp_mflags} 
 
 %install
@@ -55,12 +55,6 @@
     killall -HUP gconfd-2 || :
 fi
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/config_newaction.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
-
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -81,9 +75,15 @@
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-nact.desktop
 %{_datadir}/pixmaps/nautilus-actions-icon.png
-%config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Wed Feb 8 2006 Deji Akingunola  - 1.0-1
+- New upstream version
+- Do away with gconf schemas installation
+
+* Mon Jan 2 2006 Deji Akingunola  - 0.99-6
+- Add nautilus extensions dir to configure arguments
+
 * Sun Jan 1 2006 Deji Akingunola  - 0.99-5
 - Remove libXdmcp-devel as BR, nautilus now takkes care of it
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Jan 2006 15:21:52 -0000	1.2
+++ sources	8 Feb 2006 22:32:43 -0000	1.3
@@ -1 +1 @@
-682d452e4b05c77b5a258c7ec49634bc  nautilus-actions-0.99.tar.gz
+fde8d7ad832009bfd1746bf076e8a838  nautilus-actions-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 22:34:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed,  8 Feb 2006 17:34:26 -0500
Subject: rpms/nautilus-actions/FC-4 .cvsignore, 1.2,
	1.3 nautilus-actions.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200602082234.k18MYwCg023342@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-serv23175

Modified Files:
	.cvsignore nautilus-actions.spec sources 
Log Message:
* Wed Feb 8 2006 Deji Akingunola  - 1.0-1
- New upstream version
- Do away with gconf schemas installation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Jan 2006 15:21:52 -0000	1.2
+++ .cvsignore	8 Feb 2006 22:34:26 -0000	1.3
@@ -1 +1 @@
-nautilus-actions-0.99.tar.gz
+nautilus-actions-1.0.tar.gz


Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/nautilus-actions.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nautilus-actions.spec	2 Jan 2006 23:30:05 -0000	1.3
+++ nautilus-actions.spec	8 Feb 2006 22:34:26 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
-Version: 0.99
-Release: 6%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -11,7 +11,6 @@
 BuildRequires: e2fsprogs-devel
 BuildRequires: desktop-file-utils
 Requires(pre): GConf2
-Requires(post): GConf2
 Requires(preun): GConf2
 
 %description
@@ -56,12 +55,6 @@
     killall -HUP gconfd-2 || :
 fi
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/config_newaction.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
-
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -82,9 +75,12 @@
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-nact.desktop
 %{_datadir}/pixmaps/nautilus-actions-icon.png
-%config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Wed Feb 8 2006 Deji Akingunola  - 1.0-1
+- New upstream version
+- Do away with gconf schemas installation
+
 * Mon Jan 2 2006 Deji Akingunola  - 0.99-6
 - Add nautilus extensions dir to configure arguments
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Jan 2006 15:21:52 -0000	1.2
+++ sources	8 Feb 2006 22:34:26 -0000	1.3
@@ -1 +1 @@
-682d452e4b05c77b5a258c7ec49634bc  nautilus-actions-0.99.tar.gz
+fde8d7ad832009bfd1746bf076e8a838  nautilus-actions-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 22:36:06 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed,  8 Feb 2006 17:36:06 -0500
Subject: rpms/nautilus-actions/FC-3 .cvsignore, 1.2,
	1.3 nautilus-actions.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200602082236.k18Mac6j023861@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23698

Modified Files:
	.cvsignore nautilus-actions.spec sources 
Log Message:
* Wed Feb 8 2006 Deji Akingunola  - 1.0-1
- New upstream version
- Do away with gconf schemas installation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Jan 2006 15:21:52 -0000	1.2
+++ .cvsignore	8 Feb 2006 22:36:06 -0000	1.3
@@ -1 +1 @@
-nautilus-actions-0.99.tar.gz
+nautilus-actions-1.0.tar.gz


Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nautilus-actions.spec	3 Jan 2006 20:23:34 -0000	1.5
+++ nautilus-actions.spec	8 Feb 2006 22:36:06 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
-Version: 0.99
-Release: 7.1%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -11,7 +11,6 @@
 BuildRequires: e2fsprogs-devel
 BuildRequires: desktop-file-utils
 Requires(pre): GConf2
-Requires(post): GConf2
 Requires(preun): GConf2
 
 %description
@@ -56,12 +55,6 @@
     killall -HUP gconfd-2 || :
 fi
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/config_newaction.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
-
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -80,9 +73,12 @@
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-nact.desktop
 %{_datadir}/pixmaps/nautilus-actions-icon.png
-%config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Wed Feb 8 2006 Deji Akingunola  - 1.0-1
+- New upstream version
+- Do away with gconf schemas installation
+
 * Tue Jan 3 2006 Deji Akingunola  - 0.99-7.1
 - Disable commandline-tool option on FC3 as Glib-2.4 doesn't implement
   the necesary api


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Jan 2006 15:21:52 -0000	1.2
+++ sources	8 Feb 2006 22:36:06 -0000	1.3
@@ -1 +1 @@
-682d452e4b05c77b5a258c7ec49634bc  nautilus-actions-0.99.tar.gz
+fde8d7ad832009bfd1746bf076e8a838  nautilus-actions-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb  8 23:09:40 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  8 Feb 2006 18:09:40 -0500
Subject: rpms/hdf/devel hdf.spec,1.6,1.7
Message-ID: <200602082310.k18NAD8K030747@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	hdf.spec 
Log Message:
Compile with -DHAVE_NETCDF for gdl hdf/netcdf compatibility



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hdf.spec	2 Feb 2006 22:10:26 -0000	1.6
+++ hdf.spec	8 Feb 2006 23:09:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -41,7 +41,7 @@
 
 %build
 autoconf
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CFLAGS="$RPM_OPT_FLAGS -fPIC -DHAVE_NETCDF"
 %configure F77=gfortran FFLAGS=-ffixed-line-length-none
 make
 
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Wed Feb  8 2006 Orion Poplawski  4.2r1-8
+- Compile with -DHAVE_NETCDF for gdl hdf/netcdf compatibility
+
 * Thu Feb  2 2006 Orion Poplawski  4.2r1-7
 - Add patch to build on ppc
 



From fedora-extras-commits at redhat.com  Thu Feb  9 00:42:03 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed,  8 Feb 2006 19:42:03 -0500
Subject: rpms/fetchlog/devel .cvsignore,1.3,1.4 sources,1.4,1.5
Message-ID: <200602090042.k190gZvt000538@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Feb 2006 23:25:07 -0000	1.3
+++ .cvsignore	9 Feb 2006 00:42:02 -0000	1.4
@@ -1 +1,2 @@
+fetchlog-1.0.tar.gz
 fetchlog-build.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Feb 2006 23:41:01 -0000	1.4
+++ sources	9 Feb 2006 00:42:02 -0000	1.5
@@ -1 +1,2 @@
 e2ef0a076d1901c489c953fe48e1b2a9  fetchlog-1.0.tar.gz
+99228569b122b994b1ab83148a3bd261  fetchlog-build.patch



From fedora-extras-commits at redhat.com  Thu Feb  9 07:33:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  9 Feb 2006 02:33:56 -0500
Subject: rpms/wine/FC-3 wine.spec,1.9,1.10
Message-ID: <200602090734.k197YSZ2014248@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	wine.spec 
Log Message:
- use sources without winemp3



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wine.spec	8 Feb 2006 13:35:46 -0000	1.9
+++ wine.spec	9 Feb 2006 07:33:55 -0000	1.10
@@ -1,12 +1,13 @@
 Name:		wine
 Version:	0.9.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.7.tar.bz2
+# special fedora tarball without winemp3 stuff
+Source0:        wine-0.9.7-fe.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -142,7 +143,7 @@
 with the Wine Windows(TM) emulation libraries.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-fe
 %patch2 -p1 -b .generated
 autoconf
 
@@ -513,7 +514,6 @@
 %{_libdir}/wine/windebug.dll.so
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winedos.dll.so
-%{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
@@ -679,6 +679,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Feb 09 2006 Andreas Bierfert 
+0.9.7-3
+- fix up tarball
+
 * Wed Feb 08 2006 Andreas Bierfert 
 0.9.7-2
 - fix up post/preun scriptlets (#178954)



From fedora-extras-commits at redhat.com  Thu Feb  9 07:34:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  9 Feb 2006 02:34:02 -0500
Subject: rpms/wine/FC-4 wine.spec,1.11,1.12
Message-ID: <200602090734.k197YZDU014251@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	wine.spec 
Log Message:
- use sources without winemp3



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wine.spec	8 Feb 2006 13:35:52 -0000	1.11
+++ wine.spec	9 Feb 2006 07:34:02 -0000	1.12
@@ -1,12 +1,13 @@
 Name:		wine
 Version:	0.9.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.7.tar.bz2
+# special fedora tarball without winemp3 stuff
+Source0:        wine-0.9.7-fe.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -142,7 +143,7 @@
 with the Wine Windows(TM) emulation libraries.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-fe
 %patch2 -p1 -b .generated
 autoconf
 
@@ -513,7 +514,6 @@
 %{_libdir}/wine/windebug.dll.so
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winedos.dll.so
-%{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
@@ -679,6 +679,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Feb 09 2006 Andreas Bierfert 
+0.9.7-3
+- fix up tarball
+
 * Wed Feb 08 2006 Andreas Bierfert 
 0.9.7-2
 - fix up post/preun scriptlets (#178954)



From fedora-extras-commits at redhat.com  Thu Feb  9 07:34:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  9 Feb 2006 02:34:08 -0500
Subject: rpms/wine/devel wine.spec,1.13,1.14
Message-ID: <200602090734.k197Ye7B014254@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	wine.spec 
Log Message:
- use sources without winemp3



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wine.spec	8 Feb 2006 13:35:58 -0000	1.13
+++ wine.spec	9 Feb 2006 07:34:08 -0000	1.14
@@ -2,13 +2,14 @@
 
 Name:		wine
 Version:	0.9.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.7.tar.bz2
+# special fedora tarball without winemp3 stuff
+Source0:        wine-0.9.7-fe.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -526,7 +527,6 @@
 %{_libdir}/wine/windebug.dll.so
 %{_libdir}/wine/wineaudioio.drv.so
 %{_libdir}/wine/winedos.dll.so
-%{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
@@ -692,6 +692,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Feb 09 2006 Andreas Bierfert 
+0.9.7-3
+- fix up tarball
+
 * Wed Feb 08 2006 Andreas Bierfert 
 0.9.7-2
 - fix up post/preun scriplets (#178954)



From fedora-extras-commits at redhat.com  Thu Feb  9 07:41:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  9 Feb 2006 02:41:26 -0500
Subject: rpms/wine/FC-3 .cvsignore,1.6,1.7 sources,1.7,1.8
Message-ID: <200602090741.k197fxqM014352@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	.cvsignore sources 
Log Message:
- forgot new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2006 23:19:13 -0000	1.6
+++ .cvsignore	9 Feb 2006 07:41:26 -0000	1.7
@@ -1,2 +1,2 @@
 wine-fonts-20050524.tar.gz
-wine-0.9.7.tar.bz2
+wine-0.9.7-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Feb 2006 23:19:13 -0000	1.7
+++ sources	9 Feb 2006 07:41:26 -0000	1.8
@@ -1,2 +1,2 @@
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
-92b9af6e2c108bda8d23497abd9d0356  wine-0.9.7.tar.bz2
+a960bd5c78b2c919d8ea316e9d32d20b  wine-0.9.7-fe.tar.bz2



From fedora-extras-commits at redhat.com  Thu Feb  9 07:41:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  9 Feb 2006 02:41:32 -0500
Subject: rpms/wine/FC-4 .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <200602090742.k197g4nP014356@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	.cvsignore sources 
Log Message:
- forgot new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Feb 2006 23:19:19 -0000	1.7
+++ .cvsignore	9 Feb 2006 07:41:32 -0000	1.8
@@ -1,2 +1,2 @@
 wine-fonts-20050524.tar.gz
-wine-0.9.7.tar.bz2
+wine-0.9.7-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Feb 2006 23:19:19 -0000	1.8
+++ sources	9 Feb 2006 07:41:32 -0000	1.9
@@ -1,2 +1,2 @@
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
-92b9af6e2c108bda8d23497abd9d0356  wine-0.9.7.tar.bz2
+a960bd5c78b2c919d8ea316e9d32d20b  wine-0.9.7-fe.tar.bz2



From fedora-extras-commits at redhat.com  Thu Feb  9 07:41:38 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  9 Feb 2006 02:41:38 -0500
Subject: rpms/wine/devel .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <200602090742.k197gA56014360@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	.cvsignore sources 
Log Message:
- forgot new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Feb 2006 23:19:25 -0000	1.7
+++ .cvsignore	9 Feb 2006 07:41:38 -0000	1.8
@@ -1,2 +1,2 @@
 wine-fonts-20050524.tar.gz
-wine-0.9.7.tar.bz2
+wine-0.9.7-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Feb 2006 23:19:25 -0000	1.8
+++ sources	9 Feb 2006 07:41:38 -0000	1.9
@@ -1,2 +1,2 @@
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
-92b9af6e2c108bda8d23497abd9d0356  wine-0.9.7.tar.bz2
+a960bd5c78b2c919d8ea316e9d32d20b  wine-0.9.7-fe.tar.bz2



From fedora-extras-commits at redhat.com  Thu Feb  9 07:54:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  9 Feb 2006 02:54:17 -0500
Subject: rpms/wine/devel wine.spec,1.14,1.15
Message-ID: <200602090754.k197snuc014547@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	wine.spec 
Log Message:
- forgot -n for new sources



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wine.spec	9 Feb 2006 07:34:08 -0000	1.14
+++ wine.spec	9 Feb 2006 07:54:17 -0000	1.15
@@ -155,7 +155,7 @@
 with the Wine Windows(TM) emulation libraries.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-fe
 %patch2 -p1 -b .generated
 autoconf
 



From fedora-extras-commits at redhat.com  Thu Feb  9 08:45:08 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  9 Feb 2006 03:45:08 -0500
Subject: rpms/azureus/devel azureus-ConfigSectionPlugins-swt-3.1.patch, NONE,
	1.1 azureus-Messages-swt-3.1.patch, NONE,
	1.1 azureus-TableView-swt-3.1.patch, NONE,
	1.1 azureus-no-install-remove-plugins.patch, NONE,
	1.1 azureus-rh-bugzilla-180418.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 azureus-base64.patch, 1.1, 1.2 azureus-cache-size.patch, 1.1,
	1.2 azureus-no-bouncycastle.patch, 1.1,
	1.2 azureus-no-shared-plugins.patch, 1.1,
	1.2 azureus-remove-manifest-classpath.patch, 1.1,
	1.2 azureus-remove-win32-PlatformManagerUpdateChecker.patch, 1.1,
	1.2 azureus-remove-win32-osx-platforms.patch, 1.1,
	1.2 azureus-themed.patch, 1.1, 1.2 azureus.script, 1.5,
	1.6 azureus.spec, 1.12, 1.13 sources, 1.2, 1.3
Message-ID: <200602090845.k198jfPK016596@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	.cvsignore azureus-base64.patch azureus-cache-size.patch 
	azureus-no-bouncycastle.patch azureus-no-shared-plugins.patch 
	azureus-remove-manifest-classpath.patch 
	azureus-remove-win32-PlatformManagerUpdateChecker.patch 
	azureus-remove-win32-osx-platforms.patch azureus-themed.patch 
	azureus.script azureus.spec sources 
Added Files:
	azureus-ConfigSectionPlugins-swt-3.1.patch 
	azureus-Messages-swt-3.1.patch azureus-TableView-swt-3.1.patch 
	azureus-no-install-remove-plugins.patch 
	azureus-rh-bugzilla-180418.patch 
Log Message:
Upgrade to cvs snapshot of 2.3.0.7 (or will it be 2.4.0.0?).  Many changes.


azureus-ConfigSectionPlugins-swt-3.1.patch:

--- NEW FILE azureus-ConfigSectionPlugins-swt-3.1.patch ---
--- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java.~1.7.~	2005-12-21 07:34:08.000000000 -0800
+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java	2006-01-25 14:40:42.000000000 -0800
@@ -373,12 +373,6 @@
 			tc.addSelectionListener(new SelectionAdapter() {
 				public void widgetSelected(SelectionEvent e) {
 					boolean ascending = comparator.setField(table.indexOf(tc));
-					try {
-						table.setSortColumn(tc);
-						table.setSortDirection(ascending ? SWT.UP : SWT.DOWN);
-					} catch (NoSuchMethodError ignore) {
-						// Ignore Pre 3.0
-					}
 					Collections.sort(pluginIFs, comparator);
 					table.clearAll();
 				}

azureus-Messages-swt-3.1.patch:

--- NEW FILE azureus-Messages-swt-3.1.patch ---
--- org/gudy/azureus2/ui/swt/Messages.java.orig	2006-01-31 10:12:35.000000000 -0500
+++ org/gudy/azureus2/ui/swt/Messages.java	2006-02-07 16:14:10.000000000 -0500
@@ -203,23 +203,6 @@
           ((ToolItem)widget).setToolTipText(toolTip);
         }
       }
-    } else if (widget instanceof TableColumn) {
-      String key = (String) widget.getData();
-			if (key != null) {
-				if (!key.endsWith(".info"))
-					key += ".info";
-				String toolTip = MessageText.getString(key, (String) null);
-				if (toolTip == null)
-					toolTip = MessageText.getString(key.substring(0, key.length() - 5),
-							(String) null);
-				if (toolTip != null) {
-					try {
-						((TableColumn) widget).setToolTipText(toolTip);
-					} catch (NoSuchMethodError e) {
-						// Pre SWT 3.2
-					}
-				}
-			}
     }
   }
   

azureus-TableView-swt-3.1.patch:

--- NEW FILE azureus-TableView-swt-3.1.patch ---
--- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/TableView.java.~1.81.~	2006-01-23 07:42:54.000000000 -0800
+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/TableView.java	2006-01-25 14:49:25.000000000 -0800
@@ -2672,27 +2672,7 @@
 	}
 
 	private void changeColumnIndicator() {
-		if (table == null || table.isDisposed())
-			return;
-
-		try {
-			// can't use TableColumnCore.getPosition, because user may have moved
-			// columns around, messing up the SWT column indexes.  
-			// We can either use search columnsOrdered, or search table.getColumns()
-			TableColumn[] tcs = table.getColumns();
-			for (int i = 0; i < tcs.length; i++) {
-				String sName = (String)tcs[i].getData("Name");
-				if (sName != null && sName.equals(rowSorter.sColumnName)) {
-					table.setSortDirection(rowSorter.bAscending ? SWT.UP : SWT.DOWN);
-					table.setSortColumn(tcs[i]);
-					return;
-				}
-			}
-
-			table.setSortColumn(null);
-		} catch (NoSuchMethodError e) {
-			// sWT < 3.2 doesn't have column indicaters
-		}
+	    return;
 	}
 
 	private void visibleRowsChanged() {

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

--- NEW FILE azureus-no-install-remove-plugins.patch ---
--- 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
@@ -347,26 +347,6 @@
       menu_plugin.setMenu(pluginMenu);
       if(notMainWindow) {performOneTimeDisable(menu_plugin, true);}
 
-      new MenuItem(pluginMenu, SWT.SEPARATOR);
-      
-      MenuItem plugins_install_wizard = new MenuItem(pluginMenu, SWT.NULL);
-      KeyBindings.setAccelerator(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins");
-      Messages.setLanguageText(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins"); //$NON-NLS-1$
-      plugins_install_wizard.addListener(SWT.Selection, new Listener() {
-        public void handleEvent(Event e) {
-          new InstallPluginWizard(mainWindow.getAzureusCore(), display);
-        }
-      });
-      
-      MenuItem plugins_uninstall_wizard = new MenuItem(pluginMenu, SWT.NULL);
-      KeyBindings.setAccelerator(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins");
-      Messages.setLanguageText(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins"); //$NON-NLS-1$
-      plugins_uninstall_wizard.addListener(SWT.Selection, new Listener() {
-        public void handleEvent(Event e) {
-          new UnInstallPluginWizard(mainWindow.getAzureusCore(), display);
-        }
-      });
-
       // standard items
       if(Constants.isOSX) {
           // Window menu
@@ -452,18 +432,6 @@
       
       new MenuItem(helpMenu,SWT.SEPARATOR);
       
-      if ( !SystemProperties.isJavaWebStartInstance()){
-        MenuItem help_checkupdate = new MenuItem(helpMenu, SWT.NULL);
-        KeyBindings.setAccelerator(help_checkupdate, "MainWindow.menu.help.checkupdate");
-        Messages.setLanguageText(help_checkupdate, "MainWindow.menu.help.checkupdate"); //$NON-NLS-1$
-        help_checkupdate.addListener(SWT.Selection, new Listener() {
-        	public void handleEvent(Event e) {
-        		mainWindow.getShell().setFocus();
-        		UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck();
-        	}
-        });
-      }
-
       MenuItem help_donate = new MenuItem(helpMenu, SWT.NULL);
       Messages.setLanguageText(help_donate, "MainWindow.menu.help.donate"); //$NON-NLS-1$
       help_donate.addListener(SWT.Selection, new Listener() {

azureus-rh-bugzilla-180418.patch:

--- NEW FILE azureus-rh-bugzilla-180418.patch ---
--- build.xml~	2006-02-08 08:05:29.000000000 -0500
+++ build.xml	2006-02-08 08:04:50.000000000 -0500
@@ -29,7 +29,7 @@
          
       
    
-   	
+   	
          
       
    


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 23:08:02 -0000	1.2
+++ .cvsignore	9 Feb 2006 08:45:07 -0000	1.3
@@ -1 +1 @@
-Azureus_2.3.0.6_source_nocrypto.zip
+azureus2-cvs-20060207.tar.gz

azureus-base64.patch:

Index: azureus-base64.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-base64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-base64.patch	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus-base64.patch	9 Feb 2006 08:45:07 -0000	1.2
@@ -1,14 +1,3 @@
---- com/aelitis/net/udp/impl/PRUDPPacketHandlerImpl.java~	2005-11-22 12:07:30.000000000 -0800
-+++ com/aelitis/net/udp/impl/PRUDPPacketHandlerImpl.java	2006-01-17 21:56:00.000000000 -0800
-@@ -43,7 +43,7 @@
- import com.aelitis.net.udp.PRUDPPacketRequest;
- import com.aelitis.net.udp.PRUDPRequestHandler;
- 
--import org.bouncycastle.util.encoders.Base64;
-+import gnu.crypto.util.Base64;
- 
- public class 
- PRUDPPacketHandlerImpl
 --- org/gudy/azureus2/ui/console/util/StringEncrypter.java~	2005-10-14 04:43:14.000000000 -0700
 +++ org/gudy/azureus2/ui/console/util/StringEncrypter.java	2006-01-17 21:56:24.000000000 -0800
 @@ -12,7 +12,7 @@

azureus-cache-size.patch:

Index: azureus-cache-size.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-cache-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-cache-size.patch	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus-cache-size.patch	9 Feb 2006 08:45:07 -0000	1.2
@@ -1,11 +1,11 @@
---- org/gudy/azureus2/core3/config/COConfigurationManager.java~	2005-10-05 11:27:44.000000000 -0700
-+++ org/gudy/azureus2/core3/config/COConfigurationManager.java	2006-01-18 19:49:48.000000000 -0800
+--- org/gudy/azureus2/core3/config/COConfigurationManager.java.~1.34.~	2006-01-19 21:27:18.000000000 -0500
++++ org/gudy/azureus2/core3/config/COConfigurationManager.java	2006-02-09 00:01:46.000000000 -0500
 @@ -39,7 +39,7 @@
- 	public static final int CONFIG_CACHE_SIZE_MAX_MB;
- 	
- 	static{
--		long max_mem_bytes 	= Runtime.getRuntime().maxMemory();
-+	    long max_mem_bytes 	= Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
- 	    long mb_1			= 1*1024*1024;
- 	    long mb_32			= 32*mb_1;
- 	    CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1);
+ 	public static final int CONFIG_CACHE_SIZE_MAX_MB;
+ 	
+ 	static{
+-		long max_mem_bytes 	= Runtime.getRuntime().maxMemory();
++	    long max_mem_bytes 	= Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
+ 	    long mb_1			= 1*1024*1024;
+ 	    long mb_32			= 32*mb_1;
+ 	    CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1);

azureus-no-bouncycastle.patch:

Index: azureus-no-bouncycastle.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-bouncycastle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-bouncycastle.patch	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus-no-bouncycastle.patch	9 Feb 2006 08:45:07 -0000	1.2
@@ -1,21 +1,11 @@
---- org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java~	2006-01-17 21:58:55.000000000 -0800
-+++ org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java	2006-01-17 22:20:05.000000000 -0800
-@@ -94,7 +94,7 @@
- 		}
- 		
- 		try{
--			SESecurityManagerBC.initialise();
-+		    //			SESecurityManagerBC.initialise();
- 			
- 		}catch( Throwable e ){
- 			
-@@ -505,7 +505,8 @@
- 	
- 		throws Exception
- 	{
--		return( SESecurityManagerBC.createSelfSignedCertificate( this, alias, cert_dn, strength ));
-+	    //		return( SESecurityManagerBC.createSelfSignedCertificate( this, alias, cert_dn, strength ));
-+	    return null;
- 	}
- 	
- 	public boolean
+--- org/gudy/azureus2/core3/config/COConfigurationManager.java.orig	2006-01-19 18:27:18.000000000 -0800
++++ org/gudy/azureus2/core3/config/COConfigurationManager.java	2006-01-25 12:14:49.000000000 -0800
+@@ -39,7 +39,7 @@
+ 	public static final int CONFIG_CACHE_SIZE_MAX_MB;
+ 	
+ 	static{
+-		long max_mem_bytes 	= Runtime.getRuntime().maxMemory();
++	    long max_mem_bytes 	= Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
+ 	    long mb_1			= 1*1024*1024;
+ 	    long mb_32			= 32*mb_1;
+ 	    CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1);

azureus-no-shared-plugins.patch:

Index: azureus-no-shared-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-shared-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-shared-plugins.patch	28 Jan 2006 21:35:57 -0000	1.1
+++ azureus-no-shared-plugins.patch	9 Feb 2006 08:45:07 -0000	1.2
@@ -1,36 +1,30 @@
---- org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java~	2005-11-22 14:28:02.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java	2006-01-27 23:12:16.000000000 -0500
-@@ -237,21 +237,15 @@
-   	}
-   
- 	public boolean 
--	isNextEnabled() 
-+	isFinishEnabled() 
- 	{
- 		return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
- 	}
- 	
--	public boolean 
--	isFinishEnabled() 
--	{
--	   return false ;
-+	public IWizardPanel getFinishPanel() {
-+	    return new IPWFinishPanel(wizard,this);
- 	}
- 	
--  public IWizardPanel getNextPanel() {
--    return new IPWInstallModePanel(wizard,this);
--  }
--	
-   public void updateList() {
-     ArrayList list = new ArrayList();
-     TableItem[] items = pluginList.getItems();
-@@ -261,7 +255,7 @@
-       }
-     }
-     ((InstallPluginWizard)wizard).setPluginList(list);
--    ((InstallPluginWizard)wizard).setNextEnabled( isNextEnabled() );
-+    ((InstallPluginWizard)wizard).setFinishEnabled( isFinishEnabled() );
-     
-   }
- }
+--- org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java	2006-02-08 17:17:47.000000000 -0500
++++ org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java.orig	2005-12-13 02:37:15.000000000 -0500
+@@ -237,14 +237,14 @@
+   	}
+   
+ 	public boolean 
+-	isNextEnabled() 
++	isFinishEnabled()
+ 	{
+ 		return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
+ 	}
+ 	
+-  public IWizardPanel getNextPanel() {
+-    return new IPWInstallModePanel(wizard,this);
+-  }
++ 	public IWizardPanel getFinishPanel() {
++ 	    return new IPWFinishPanel(wizard,this);
++	}
+ 	
+   public void updateList() {
+     ArrayList list = new ArrayList();
+@@ -255,7 +255,7 @@
+       }
+     }
+     ((InstallPluginWizard)wizard).setPluginList(list);
++    ((InstallPluginWizard)wizard).setFinishEnabled( isFinishEnabled() );
+-    ((InstallPluginWizard)wizard).setNextEnabled( isNextEnabled() );
+     
+   }
+ }

azureus-remove-manifest-classpath.patch:

Index: azureus-remove-manifest-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-remove-manifest-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-remove-manifest-classpath.patch	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus-remove-manifest-classpath.patch	9 Feb 2006 08:45:07 -0000	1.2
@@ -1,10 +1,10 @@
---- build.xml~	2005-10-25 07:21:24.000000000 -0700
-+++ build.xml	2006-01-19 06:39:07.000000000 -0800
+--- build.xml.orig	2005-10-25 05:22:46.000000000 -0700
++++ build.xml	2006-01-25 12:16:32.000000000 -0800
 @@ -39,7 +39,6 @@
-       
-          
-             
--            
-          
-       
-       
+       
+          
+             
+-            
+          
+       
+       

azureus-remove-win32-PlatformManagerUpdateChecker.patch:

Index: azureus-remove-win32-PlatformManagerUpdateChecker.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-remove-win32-PlatformManagerUpdateChecker.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-remove-win32-PlatformManagerUpdateChecker.patch	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus-remove-win32-PlatformManagerUpdateChecker.patch	9 Feb 2006 08:45:07 -0000	1.2
@@ -1,14 +1,14 @@
---- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java~	2005-10-18 17:40:06.000000000 -0700
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2005-12-17 19:19:51.000000000 -0800
-@@ -131,11 +131,6 @@
-    					"azbpcorepatcher", 
-    					"CorePatcher",
- 					"true" },
--	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
--   					"org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker", 
--   					"azplatform2", 
--   					"azplatform2",
--					"true" },
- 	   		{	 PluginManagerDefaults.PID_JPC, 
- 					"com.aelitis.azureus.plugins.jpc.JPCPlugin", 
- 					"azjpc", 
+--- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig	2006-01-11 09:05:48.000000000 -0800
++++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2006-01-25 11:51:54.000000000 -0800
+@@ -133,11 +133,6 @@
+    					"azbpcorepatcher", 
+    					"CorePatcher",
+ 					"true" },
+-	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
+-   					"org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker", 
+-   					"azplatform2", 
+-   					"azplatform2",
+-					"true" },
+ 	   		{	 PluginManagerDefaults.PID_JPC, 
+ 					"com.aelitis.azureus.plugins.jpc.JPCPlugin", 
+ 					"azjpc", 

azureus-remove-win32-osx-platforms.patch:

Index: azureus-remove-win32-osx-platforms.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-remove-win32-osx-platforms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-remove-win32-osx-platforms.patch	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus-remove-win32-osx-platforms.patch	9 Feb 2006 08:45:07 -0000	1.2
@@ -1,31 +1,36 @@
---- org/gudy/azureus2/platform/PlatformManagerFactory.java~	2005-09-12 14:00:06.000000000 -0700
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2005-12-17 12:35:09.000000000 -0800
-@@ -44,28 +44,6 @@
- 			class_mon.enter();
- 		
- 			if ( platform_manager == null ){
--										  
--				try{
--					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
--						
--						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
--						
--					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
--						
--	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
--	                    
--					}
--				}catch( PlatformManagerException e ){
--					
--						// exception will already have been logged
--					
--				}catch( Throwable e ){
--					
--					Debug.printStackTrace(e);
--				}
--			}
--			
--			if ( platform_manager == null ){
- 				
- 				platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
- 			}
+--- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig	2005-09-12 12:00:07.000000000 -0700
++++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2006-01-25 11:25:11.000000000 -0800
+@@ -43,32 +43,7 @@
+ 		try{
+ 			class_mon.enter();
+ 		
+-			if ( platform_manager == null ){
+-										  
+-				try{
+-					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
+-						
+-						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
+-						
+-					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
+-						
+-	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
+-	                    
+-					}
+-				}catch( PlatformManagerException e ){
+-					
+-						// exception will already have been logged
+-					
+-				}catch( Throwable e ){
+-					
+-					Debug.printStackTrace(e);
+-				}
+-			}
+-			
+-			if ( platform_manager == null ){
+-				
+-				platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
+-			}
++			platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
+ 			
+ 			return( platform_manager );
+ 			

azureus-themed.patch:

Index: azureus-themed.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-themed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-themed.patch	26 Jan 2006 07:34:09 -0000	1.1
+++ azureus-themed.patch	9 Feb 2006 08:45:07 -0000	1.2
@@ -1,111 +1,111 @@
---- org/gudy/azureus2/ui/swt/ImageRepository.java~	2006-01-25 23:03:14.000000000 -0800
-+++ org/gudy/azureus2/ui/swt/ImageRepository.java	2006-01-25 23:08:05.000000000 -0800
-@@ -18,6 +18,8 @@
- import java.io.ByteArrayOutputStream;
- import java.io.File;
- import java.io.InputStream;
-+import java.io.FileInputStream;
-+import java.io.FileNotFoundException;
- import java.util.*;
- 
- /**
-@@ -45,6 +47,25 @@
-     loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
-   }
- 
-+  private static org.gnu.gtk.IconTheme iconTheme;
-+
-+  public static String getThemedIcon (String name, String def)
-+  {
-+    try
-+      {
-+	if (iconTheme == null)
-+	  iconTheme = org.gnu.gtk.IconTheme.getDefault();
-+
-+	return iconTheme.lookupIcon (name, 24, 
-+				     org.gnu.gtk.IconLookupFlags.NO_SVG)
-+	  .getFilename();
-+      }
-+    catch (Exception ex)
-+      {
-+	return def;
-+      }
-+  }
-+
-   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");
-@@ -88,20 +109,44 @@
-     //ToolBar Icons
- 
-     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif", "cb_open_no_default");
-+    loadImage(display, 
-+	      getThemedIcon ("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"), 
-+	      "cb_open_no_default");
-     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_folder.gif", "cb_open_folder");
-     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
--    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
-+    loadImage(display, 
-+	      getThemedIcon ("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"), 
-+	      "cb_new");
-+    loadImage(display, 
-+	      getThemedIcon ("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"), 
-+	      "cb_up");
-+    loadImage(display, 
-+	      getThemedIcon ("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"),
-+	      "cb_down");
-+    loadImage(display, 
-+	      getThemedIcon ("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"), 
-+	      "cb_top");
-+    loadImage(display, 
-+	      getThemedIcon ("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"), 
-+	      "cb_bottom");
-+    loadImage(display, 
-+	      getThemedIcon ("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"), 
-+	      "cb_run");
-+    loadImage(display, 
-+	      getThemedIcon ("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"), 
-+	      "cb_start");
-+    loadImage(display, 
-+	      getThemedIcon ("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"), 
-+	      "cb_stop");
-+    loadImage(display, 
-+	      getThemedIcon ("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"), 
-+	      "cb_remove");
-+    loadImage(display, 
-+	      getThemedIcon ("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"), 
-+	      "cb_host");
-+    loadImage(display, 
-+	      getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), 
-+	      "cb_publish");
- 
-     //Status icons
-     loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
-@@ -138,6 +183,16 @@
-     Image im = getImage(name,false);
-     if(null == im) {
-       InputStream is = loader.getResourceAsStream(res);
-+      if (is == null)
-+	{
-+	  try
-+	    {
-+	      is = new FileInputStream (res);
-+	    }
-+	  catch (FileNotFoundException fnf)
-+	    {
-+	    }
-+	}
-       if(null != is) {
-         if(alpha == 255) {
-           im = new Image(display, is);
+--- 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 @@
+ import java.io.ByteArrayOutputStream;
+ import java.io.File;
+ import java.io.InputStream;
++import java.io.FileInputStream;
++import java.io.FileNotFoundException;
+ import java.util.*;
+ 
+ /**
+@@ -43,6 +45,25 @@
+     loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
+   }
+ 
++  private static org.gnu.gtk.IconTheme iconTheme;
++
++  public static String getThemedIcon (String name, String def)
++  {
++    try
++      {
++	if (iconTheme == null)
++	  iconTheme = org.gnu.gtk.IconTheme.getDefault();
++
++	return iconTheme.lookupIcon (name, 24, 
++				     org.gnu.gtk.IconLookupFlags.NO_SVG)
++	  .getFilename();
++      }
++    catch (Exception ex)
++      {
++	return def;
++      }
++  }
++
+   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 @@
+     //ToolBar Icons
+ 
+     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif", "cb_open_no_default");
++    loadImage(display, 
++	      getThemedIcon ("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"), 
++	      "cb_open_no_default");
+     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_folder.gif", "cb_open_folder");
+     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
+-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
++    loadImage(display, 
++	      getThemedIcon ("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"), 
++	      "cb_new");
++    loadImage(display, 
++	      getThemedIcon ("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"), 
++	      "cb_up");
++    loadImage(display, 
++	      getThemedIcon ("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"),
++	      "cb_down");
++    loadImage(display, 
++	      getThemedIcon ("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"), 
++	      "cb_top");
++    loadImage(display, 
++	      getThemedIcon ("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"), 
++	      "cb_bottom");
++    loadImage(display, 
++	      getThemedIcon ("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"), 
++	      "cb_run");
++    loadImage(display, 
++	      getThemedIcon ("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"), 
++	      "cb_start");
++    loadImage(display, 
++	      getThemedIcon ("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"), 
++	      "cb_stop");
++    loadImage(display, 
++	      getThemedIcon ("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"), 
++	      "cb_remove");
++    loadImage(display, 
++	      getThemedIcon ("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"), 
++	      "cb_host");
++    loadImage(display, 
++	      getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), 
++	      "cb_publish");
+ 
+     //Status icons
+     loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
+@@ -139,6 +184,16 @@
+     Image im = getImage(name,false);
+     if(null == im) {
+       InputStream is = loader.getResourceAsStream(res);
++      if (is == null)
++	{
++	  try
++	    {
++	      is = new FileInputStream (res);
++	    }
++	  catch (FileNotFoundException fnf)
++	    {
++	    }
++	}
+       if(null != is) {
+       	try { 
+ 	        if(alpha == 255) {


Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- azureus.script	4 Feb 2006 13:19:26 -0000	1.5
+++ azureus.script	9 Feb 2006 08:45:07 -0000	1.6
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.2 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"
+APPDIR=`(cd ~; pwd)`/.azureus/app
+if ! test -d $APPDIR; then
+  mkdir -p $APPDIR;
+fi
+
+CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- azureus.spec	4 Feb 2006 13:32:53 -0000	1.12
+++ azureus.spec	9 Feb 2006 08:45:07 -0000	1.13
@@ -1,15 +1,15 @@
 Name:           azureus
-Version:        2.3.0.6
-Release:        23%{?dist}
+Version:        2.3.0.7
+Release:        0%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://azureus.sourceforge.net
 
-# This is just the upstream Azureus_2.3.0.6_source.zip file with 
-# the crypto code removed (org/bouncycastle).
-Source0:        Azureus_2.3.0.6_source_nocrypto.zip
+# A cvs snapshot with the build and bouncycastle directories
+# removed.
+Source0:        azureus2-cvs-20060207.tar.gz
 
 Source1:        azureus.script
 Source2:        Azureus.desktop
@@ -17,26 +17,23 @@
 Source4:        azureus-License.txt
 Source5:        azureus-ChangeLog.txt
 
-Patch0:         azureus-sun.misc.Cleaner.patch
-Patch1:         azureus-sun.misc.Signal.patch
-Patch2:         azureus-java.beans.XMLEncoder.patch
-Patch3:         azureus-remove-win32-osx-platforms.patch
-Patch4:         azureus-remove-win32-PlatformManagerUpdateChecker.patch
-Patch5:         azureus-jessie.patch
-Patch6:         azureus-GKR.patch
-Patch7:         azureus-ConfigurationManager-improvement.patch
-Patch8:         azureus-base64.patch
-Patch9:         azureus-no-bouncycastle.patch
-Patch10:        azureus-cache-size.patch
-Patch11:        azureus-remove-manifest-classpath.patch
-Patch12:        azureus-themed.patch
-Patch13:        azureus-no-shared-plugins.patch
-Patch14:        azureus-no-shared-plugins2.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
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
-BuildRequires:  jakarta-commons-cli, libswt3-gtk2 >= 3.1.2, log4j, gnu-crypto, libgtk-java, glib-java
-Requires:       jakarta-commons-cli, libswt3-gtk2 >= 3.1.2, log4j, gnu-crypto, libgtk-java, glib-java
+BuildRequires:  jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+Requires:       jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
 Requires:       libgcj >= 4.1.0-0.15
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
@@ -51,7 +48,7 @@
 advanced users.
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q -n %{name}2
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
@@ -63,23 +60,17 @@
 %patch8 -p0
 %patch9 -p0
 %patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
 %build
 mkdir -p build/libs
-build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.2 log4j gnu-crypto gtk2.8 glib0.2
+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
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
-# Remove the BouncyCastle security manager.
-rm org/gudy/azureus2/core3/security/impl/SESecurityManagerBC.java
 # Remove test code
-rm org/gudy/azureus2/ui/console/multiuser/TestUserManager.java
 rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
 ant jar
 
@@ -150,6 +141,11 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Thu Feb  9 2006 Anthony Green  - 2.3.0.7-0
+- Move to 2.3.0.7 snapshot (or will it be 2.4.0.0?).
+- Many related changes.
+- Remove ability to install plugins.
+
 * Sat Feb  4 2006 Anthony Green  - 2.3.0.6-23
 - Fix thinko in last revision.
 
@@ -173,6 +169,10 @@
 - Use "$@" instead of $* in azureus.script (thanks ivazquez).
 - Improve .desktop file.
 
+* Sat Jan 21 2006 Anthony Green  - 2.3.0.6-17
+- Use "$@" instead of $* in azureus.script (thanks ivazquez).
+- Improve .desktop file.
+
 * Wed Jan 18 2006 Anthony Green  - 2.3.0.6-15
 - Remove PrintTransferTypes, which is unused and not 64-bit clean.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 23:08:02 -0000	1.2
+++ sources	9 Feb 2006 08:45:07 -0000	1.3
@@ -1 +1 @@
-e53e5b114750c552dc0773106160275b  Azureus_2.3.0.6_source_nocrypto.zip
+e37850f30f7ff46d03b65bdf228c0025  azureus2-cvs-20060207.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 08:58:04 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  9 Feb 2006 03:58:04 -0500
Subject: rpms/azureus/devel azureus.spec,1.13,1.14
Message-ID: <200602090858.k198wa5s016683@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	azureus.spec 
Log Message:
Fix the release number.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- azureus.spec	9 Feb 2006 08:45:07 -0000	1.13
+++ azureus.spec	9 Feb 2006 08:58:04 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.7
-Release:        0%{?dist}
+Release:        0.20060207cvs%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -141,6 +141,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Thu Feb  9 2006 Anthony Green  - 2.3.0.7-0.20060207cvs
+- Fix release number.
+
 * Thu Feb  9 2006 Anthony Green  - 2.3.0.7-0
 - Move to 2.3.0.7 snapshot (or will it be 2.4.0.0?).
 - Many related changes.



From fedora-extras-commits at redhat.com  Thu Feb  9 09:12:13 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  9 Feb 2006 04:12:13 -0500
Subject: rpms/azureus/devel azureus.spec, 1.14,
	1.15 azureus-ConfigSectionPlugins-swt-3.1.patch, 1.1,
	1.2 azureus-TableView-swt-3.1.patch, 1.1, 1.2
Message-ID: <200602090912.k199CtYU019084@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	azureus.spec azureus-ConfigSectionPlugins-swt-3.1.patch 
	azureus-TableView-swt-3.1.patch 
Log Message:
Fix patches.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- azureus.spec	9 Feb 2006 08:58:04 -0000	1.14
+++ azureus.spec	9 Feb 2006 09:12:12 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.7
-Release:        0.20060207cvs%{?dist}
+Release:        1.20060207cvs%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -141,6 +141,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Thu Feb  9 2006 Anthony Green  - 2.3.0.7-1.20060207cvs
+- Replace absolute paths in swt-3.1 patches with relative paths.
+
 * Thu Feb  9 2006 Anthony Green  - 2.3.0.7-0.20060207cvs
 - Fix release number.
 

azureus-ConfigSectionPlugins-swt-3.1.patch:

Index: azureus-ConfigSectionPlugins-swt-3.1.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-ConfigSectionPlugins-swt-3.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-ConfigSectionPlugins-swt-3.1.patch	9 Feb 2006 08:45:07 -0000	1.1
+++ azureus-ConfigSectionPlugins-swt-3.1.patch	9 Feb 2006 09:12:12 -0000	1.2
@@ -1,5 +1,5 @@
---- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java.~1.7.~	2005-12-21 07:34:08.000000000 -0800
-+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java	2006-01-25 14:40:42.000000000 -0800
+--- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java.~1.7.~	2005-12-21 07:34:08.000000000 -0800
++++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java	2006-01-25 14:40:42.000000000 -0800
 @@ -373,12 +373,6 @@
  			tc.addSelectionListener(new SelectionAdapter() {
  				public void widgetSelected(SelectionEvent e) {

azureus-TableView-swt-3.1.patch:

Index: azureus-TableView-swt-3.1.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-TableView-swt-3.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-TableView-swt-3.1.patch	9 Feb 2006 08:45:07 -0000	1.1
+++ azureus-TableView-swt-3.1.patch	9 Feb 2006 09:12:12 -0000	1.2
@@ -1,5 +1,5 @@
---- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/TableView.java.~1.81.~	2006-01-23 07:42:54.000000000 -0800
-+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/ui/swt/views/TableView.java	2006-01-25 14:49:25.000000000 -0800
+--- org/gudy/azureus2/ui/swt/views/TableView.java.~1.81.~	2006-01-23 07:42:54.000000000 -0800
++++ org/gudy/azureus2/ui/swt/views/TableView.java	2006-01-25 14:49:25.000000000 -0800
 @@ -2672,27 +2672,7 @@
  	}
  



From fedora-extras-commits at redhat.com  Thu Feb  9 09:41:57 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  9 Feb 2006 04:41:57 -0500
Subject: rpms/azureus/devel azureus.spec,1.15,1.16
Message-ID: <200602090942.k199gTqk019245@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	azureus.spec 
Log Message:
Add missing libgconf-java dependency.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- azureus.spec	9 Feb 2006 09:12:12 -0000	1.15
+++ azureus.spec	9 Feb 2006 09:41:56 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.7
-Release:        1.20060207cvs%{?dist}
+Release:        2.20060207cvs%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -33,7 +33,9 @@
 
 BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
 BuildRequires:  jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+BuildRequires:  libgconf-java
 Requires:       jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+Requires:       libgconf-java
 Requires:       libgcj >= 4.1.0-0.15
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
@@ -141,6 +143,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Thu Feb  9 2006 Anthony Green  - 2.3.0.7-2.20060207cvs
+- Add libgconf dependency.
+
 * Thu Feb  9 2006 Anthony Green  - 2.3.0.7-1.20060207cvs
 - Replace absolute paths in swt-3.1 patches with relative paths.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 09:58:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 04:58:34 -0500
Subject: rpms/perl-HTTP-Server-Simple/FC-4 .cvsignore, 1.5,
	1.6 perl-HTTP-Server-Simple.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200602090959.k199x6Wa019357@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19319/FC-4

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.18.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jan 2006 17:25:54 -0000	1.5
+++ .cvsignore	9 Feb 2006 09:58:34 -0000	1.6
@@ -1 +1 @@
-HTTP-Server-Simple-0.17.tar.gz
+HTTP-Server-Simple-0.18.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTTP-Server-Simple.spec	23 Jan 2006 17:25:54 -0000	1.5
+++ perl-HTTP-Server-Simple.spec	9 Feb 2006 09:58:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.17
+Version:        0.18
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Jose Pedro Oliveira  - 0.18-1
+- Update to 0.18.
+
 * Mon Jan 23 2006 Jose Pedro Oliveira  - 0.17-1
 - Update to 0.17.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jan 2006 17:25:54 -0000	1.5
+++ sources	9 Feb 2006 09:58:34 -0000	1.6
@@ -1 +1 @@
-8fed9670c5d3b3802d6a9fa5eadccd8b  HTTP-Server-Simple-0.17.tar.gz
+e7f731fb78b291b06e6291414f73fcab  HTTP-Server-Simple-0.18.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 09:58:40 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 04:58:40 -0500
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.5,
	1.6 perl-HTTP-Server-Simple.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200602090959.k199xC3o019362@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19319/devel

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.18.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jan 2006 17:26:01 -0000	1.5
+++ .cvsignore	9 Feb 2006 09:58:40 -0000	1.6
@@ -1 +1 @@
-HTTP-Server-Simple-0.17.tar.gz
+HTTP-Server-Simple-0.18.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-HTTP-Server-Simple.spec	23 Jan 2006 17:26:01 -0000	1.5
+++ perl-HTTP-Server-Simple.spec	9 Feb 2006 09:58:40 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.17
+Version:        0.18
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Jose Pedro Oliveira  - 0.18-1
+- Update to 0.18.
+
 * Mon Jan 23 2006 Jose Pedro Oliveira  - 0.17-1
 - Update to 0.17.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jan 2006 17:26:01 -0000	1.5
+++ sources	9 Feb 2006 09:58:40 -0000	1.6
@@ -1 +1 @@
-8fed9670c5d3b3802d6a9fa5eadccd8b  HTTP-Server-Simple-0.17.tar.gz
+e7f731fb78b291b06e6291414f73fcab  HTTP-Server-Simple-0.18.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 10:16:32 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 05:16:32 -0500
Subject: rpms/gtktalog/devel gtktalog.spec,1.6,1.7
Message-ID: <200602091017.k19AH5vX021262@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	gtktalog.spec 
Log Message:
Rebuild for new gcc/glibc and add modular X support.



Index: gtktalog.spec
===================================================================
RCS file: /cvs/extras/rpms/gtktalog/devel/gtktalog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtktalog.spec	6 Apr 2005 22:11:59 -0000	1.6
+++ gtktalog.spec	9 Feb 2006 10:16:30 -0000	1.7
@@ -1,10 +1,7 @@
-# $Id$
-
 Summary: The GNOME disk catalog
 Name: gtktalog
 Version: 1.0.4
-Release: 5
-
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Archiving
 URL: http://www.nongnu.org/gtktalog/
@@ -12,6 +9,10 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gnome-libs >= 1.2, zlib, eject, bzip2, /usr/bin/file
 BuildRequires: gnome-libs-devel, gtk+-devel, desktop-file-utils, gcc-c++
+%if 0%{?fedora} < 5
+%else
+BuildRequires: libSM-devel
+%endif
 
 %description
 GTKtalog is a disk catalog, it means you can use it to create a really small
@@ -61,6 +62,10 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.0.4-6
+- Add conditional to build with modular X depending on FC version.
+- Rebuild for new gcc/glibc.
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Feb  9 11:38:36 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 06:38:36 -0500
Subject: rpms/gtweakui/devel .cvsignore, 1.2, 1.3 gtweakui.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200602091139.k19Bd8nt028026@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore gtweakui.spec sources 
Log Message:
Update to 0.4.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtweakui/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:46:33 -0000	1.2
+++ .cvsignore	9 Feb 2006 11:38:35 -0000	1.3
@@ -1 +1 @@
-gTweakUI-0.0.6.tar.bz2
+gTweakUI-0.4.0.tar.bz2


Index: gtweakui.spec
===================================================================
RCS file: /cvs/extras/rpms/gtweakui/devel/gtweakui.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtweakui.spec	6 Apr 2005 22:12:00 -0000	1.5
+++ gtweakui.spec	9 Feb 2006 11:38:35 -0000	1.6
@@ -1,18 +1,16 @@
-# $Id$
-
 %define real_name gTweakUI
 
 Summary: Extra configuration dialogs for GNOME
 Name: gtweakui
-Version: 0.0.6
-Release: 5
-
+Version: 0.4.0
+Release: 1%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://gtweakui.sourceforge.net/
 Source: http://dl.sf.net/gtweakui/%{real_name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libgnomeui-devel >= 2.4.0, GConf2-devel >= 2.4.0, gettext
+BuildRequires: libgnomeui-devel >= 2.4.0, GConf2-devel >= 2.4.0, gettext-devel
+BuildRequires: perl(XML::Parser)
 Obsoletes: gTweakUI <= 0.0.6
 
 %description
@@ -22,7 +20,7 @@
 %prep
 %setup -n %{real_name}-%{version}
 
-%{__cat} <gtweakui-menus.desktop.in
+%{__cat} > gtweakui-menus.desktop.in << EOF
 [Desktop Entry]
 Name=Menus
 Comment=Change extra menu preferences
@@ -36,7 +34,7 @@
 OnlyShowIn=GNOME;
 EOF
 
-%{__cat} <gtweakui-nautilus.desktop.in
+%{__cat} > gtweakui-nautilus.desktop.in << EOF
 [Desktop Entry]
 Name=Nautilus
 Comment=Change extra nautilus preferences
@@ -50,7 +48,7 @@
 OnlyShowIn=GNOME;
 EOF
 
-%{__cat} <gtweakui-session.desktop.in
+%{__cat} > gtweakui-session.desktop.in << EOF
 [Desktop Entry]
 Name=Session
 Comment=Change extra session preferences
@@ -64,6 +62,7 @@
 OnlyShowIn=GNOME;
 EOF
 
+
 %build
 %configure
 %{__make} %{?_smp_mflags}
@@ -72,35 +71,39 @@
 %install
 %{__rm} -rf %{buildroot}
 %makeinstall
+%find_lang %{real_name}
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%files
+%files -f %{real_name}.lang
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO FAQ
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
 %{_bindir}/*
 %{_datadir}/gTweakUI/
 %{_datadir}/applications/*.desktop
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  0.4.0
+- Update to 0.4.0 to sync with freshrpms.
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 
-* Tue Nov 16 2004 Matthias Saou  0.6-4
+* Tue Nov 16 2004 Matthias Saou  0.0.6-4
 - Bump release to provide Extras upgrade path.
 
-* Thu Jul 22 2004 Matthias Saou  0.6-3
+* Thu Jul 22 2004 Matthias Saou  0.0.6-3
 - Fixed typo in summary.
 - Rebuild with proper category.
 
-* Fri Jun 11 2004 Dag Wieers  - 0.6-2
+* Fri Jun 11 2004 Dag Wieers  - 0.0.6-2
 - Added improved desktop files.
 
-* Wed Jun  9 2004 Matthias Saou  0.6-1
+* Wed Jun  9 2004 Matthias Saou  0.0.6-1
 - Adopted for freshrpms, based on provided source package.
 - Changed the name from gTweakUI to gtweakui.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtweakui/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:46:33 -0000	1.2
+++ sources	9 Feb 2006 11:38:35 -0000	1.3
@@ -1 +1 @@
-92a0f0eee8a43e0a158329ffa0465411  gTweakUI-0.0.6.tar.bz2
+9d4725ccf4a83da3f46106c3d0be6cc8  gTweakUI-0.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Feb  9 12:45:02 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Thu,  9 Feb 2006 07:45:02 -0500
Subject: rpms/yumex/devel .cvsignore, 1.12, 1.13 sources, 1.15,
	1.16 yumex.spec, 1.16, 1.17
Message-ID: <200602091245.k19CjYow030209@cvs-int.fedora.redhat.com>

Author: timlau

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

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.99.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	5 Feb 2006 12:52:46 -0000	1.12
+++ .cvsignore	9 Feb 2006 12:45:01 -0000	1.13
@@ -1 +1 @@
-yumex-0.99.4.tar.gz
+yumex-0.99.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	5 Feb 2006 12:52:46 -0000	1.15
+++ sources	9 Feb 2006 12:45:01 -0000	1.16
@@ -1 +1 @@
-6e562d7422321aa3baa2c9ecedd44933  yumex-0.99.4.tar.gz
+1f867239c92def7a4ee9a1bd8b306a6c  yumex-0.99.5.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- yumex.spec	5 Feb 2006 12:52:46 -0000	1.16
+++ yumex.spec	9 Feb 2006 12:45:01 -0000	1.17
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.4
+Version:  0.99.5
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Thu Feb  9 13:40:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  9 Feb 2006 08:40:18 -0500
Subject: owners owners.list,1.624,1.625
Message-ID: <200602091340.k19DeoHo032259@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	owners.list 
Log Message:
Add Glide3-libGL


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.624
retrieving revision 1.625
diff -u -r1.624 -r1.625
--- owners.list	8 Feb 2006 17:35:41 -0000	1.624
+++ owners.list	9 Feb 2006 13:40:17 -0000	1.625
@@ -304,6 +304,7 @@
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|Glide3-libGl|Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Feb  9 15:02:01 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:02:01 -0500
Subject: rpms/hackedbox/devel hackedbox.spec,1.5,1.6
Message-ID: <200602091502.k19F2X2l003586@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	hackedbox.spec 
Log Message:
Rebuild for new gcc/glibc and modular X.



Index: hackedbox.spec
===================================================================
RCS file: /cvs/extras/rpms/hackedbox/devel/hackedbox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hackedbox.spec	1 Apr 2005 14:11:57 -0000	1.5
+++ hackedbox.spec	9 Feb 2006 15:01:59 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: The bastard son of Blackbox, a small and fast Window Manager
 Name: hackedbox
 Version: 0.8.4
-Release: 4
+Release: 5%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://scrudgeware.org/projects/Hackedbox
@@ -12,7 +12,13 @@
 Source1: hackedbox.desktop
 Patch: blackbox-0.65.0-gcc34.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: XFree86-devel, libstdc++-devel, gcc-c++, perl
+BuildRequires: gcc-c++, perl
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXt-devel, libXext-devel
+%endif
 
 %description
 Hackedbox is a stripped down version of Blackbox - The X11 Window Manager.
@@ -27,8 +33,7 @@
 
 
 %build
-%configure \
-    --x-libraries="%{_prefix}/X11R6/%{_lib}"
+%configure
 %{__make} %{?_smp_mflags}
 
 
@@ -36,7 +41,7 @@
 %{__rm} -rf %{buildroot}
 %makeinstall
 
-# Install Session file
+# Install GDM session file
 %{__mkdir_p} %{buildroot}/etc/X11/gdm/Sessions
 %{__cat} > %{buildroot}/etc/X11/gdm/Sessions/Hackedbox << EOF
 #!/bin/sh
@@ -47,7 +52,7 @@
 %{__perl} -pi -e 's|/local||g' %{buildroot}%{_datadir}/%{name}/menu
 
 # Install the desktop entry
-%{__install} -m 644 -D %{SOURCE1} \
+%{__install} -D -p -m 644 %{SOURCE1} \
     %{buildroot}%{_datadir}/xsessions/%{name}.desktop
 
 
@@ -75,6 +80,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  0.8.4-5
+- Rebuild for new gcc/glibc and modular X.
+
 * Fri Apr  1 2005 Michael Schwendt  0.8.4-4
 - Include hackedbox datadir.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 15:21:52 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:21:52 -0500
Subject: rpms/i8kutils/devel i8kutils.spec,1.7,1.8
Message-ID: <200602091522.k19FMPEp003744@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	i8kutils.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- i8kutils.spec	16 Aug 2005 12:42:33 -0000	1.7
+++ i8kutils.spec	9 Feb 2006 15:21:52 -0000	1.8
@@ -1,9 +1,10 @@
+# http://www.coding-zone.com/?page=i8krellm
 %define gkrellmpluginver 2.5
 
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -82,6 +83,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.25-5
+- Rebuild for new gcc/glibc.
+
 * Tue Aug 16 2005 Matthias Saou  1.25-4
 - Fix init script to use amixer instead of no longer provided aumix (#165555).
 - Fix init script to not use obsolete initlog anymore.



From fedora-extras-commits at redhat.com  Thu Feb  9 15:25:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:25:03 -0500
Subject: rpms/js/devel js.spec,1.9,1.10
Message-ID: <200602091525.k19FPZnL003810@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	js.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- js.spec	30 Jan 2006 09:58:33 -0000	1.9
+++ js.spec	9 Feb 2006 15:25:02 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -130,10 +130,13 @@
 
 
 %changelog
-* Mon Jan 30 2006 Matthias Saou  1.5.0-2
+* Thu Feb  9 2006 Matthias Saou  1.5-3
+- Rebuild for new gcc/glibc.
+
+* Mon Jan 30 2006 Matthias Saou  1.5-2
 - Fix .pc file.
 
-* Thu Jan 26 2006 Matthias Saou  1.5.0-1
+* Thu Jan 26 2006 Matthias Saou  1.5-1
 - Update to 1.5.0 final.
 - Spec file cleanups.
 - Move docs from devel to main, since we need the license there.



From fedora-extras-commits at redhat.com  Thu Feb  9 15:28:02 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:28:02 -0500
Subject: rpms/kannel/devel kannel.spec,1.8,1.9
Message-ID: <200602091528.k19FSYBu003892@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	kannel.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kannel.spec	17 Nov 2005 12:25:54 -0000	1.8
+++ kannel.spec	9 Feb 2006 15:28:02 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.0
-Release: 6
+Release: 7%{?dist}
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.4.0-7
+- Rebuild for new gcc/glibc.
+
 * Thu Nov 17 2005 Matthias Saou  1.4.0-6
 - Rebuild on FC-5 devel for new openssl library.
 - Enable pcre.



From fedora-extras-commits at redhat.com  Thu Feb  9 15:37:04 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:37:04 -0500
Subject: rpms/libcaca/devel libcaca.spec,1.9,1.10
Message-ID: <200602091537.k19FbbbL003961@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	libcaca.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/devel/libcaca.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libcaca.spec	8 Jan 2006 22:47:03 -0000	1.9
+++ libcaca.spec	9 Feb 2006 15:37:04 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.9
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://sam.zoy.org/projects/libcaca/
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  0.9-9
+- Rebuild for new gcc/glibc.
+
 * Mon Jan  2 2006 Ville Skytt??  - 0.9-8
 - Include unpackaged man page symlinks.
 - Rebuild against new slang.



From fedora-extras-commits at redhat.com  Thu Feb  9 15:41:09 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:41:09 -0500
Subject: rpms/liboil/devel liboil.spec,1.13,1.14
Message-ID: <200602091541.k19Ffftn004064@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	liboil.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: liboil.spec
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- liboil.spec	3 Feb 2006 09:46:01 -0000	1.13
+++ liboil.spec	9 Feb 2006 15:41:08 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://liboil.freedesktop.org/
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  0.3.7-2
+- Rebuild for new gcc/glibc.
+
 * Fri Feb  3 2006 Matthias Saou  0.3.7-1
 - Update to 0.3.7.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 15:42:50 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:42:50 -0500
Subject: rpms/linux_logo/FC-3 .cvsignore, 1.3, 1.4 linux_logo.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200602091543.k19FhMvm004177@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore linux_logo.spec sources 
Log Message:
Update to 4.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Nov 2004 02:47:49 -0000	1.3
+++ .cvsignore	9 Feb 2006 15:42:50 -0000	1.4
@@ -1 +1 @@
-linux_logo-4.09.tar.gz
+linux_logo-4.13.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/FC-3/linux_logo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux_logo.spec	16 Nov 2004 17:52:18 -0000	1.5
+++ linux_logo.spec	9 Feb 2006 15:42:50 -0000	1.6
@@ -1,13 +1,12 @@
-# $Id$
-
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 4.09
-Release: 2
+Version: 4.13
+Release: 1%{?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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
 
@@ -17,13 +16,17 @@
 
 %prep
 %setup
+%patch -p1 -b .debug
 
 
 %build
 for logo in ./logos/*.logo ./logos/*/*.logo; do
     echo "$logo" >> logo_config
 done
-%{__make} %{?_smp_mflags} C_OPTS="-I./libsysinfo $RPM_OPT_FLAGS"
+# C_OPTS is used by linux_logo.c and C_FLAGS by libsysinfo
+%{__make} %{?_smp_mflags} \
+    C_OPTS="%{optflags} -I./\$(LIBSYSINFO)" \
+    C_FLAGS="%{optflags} -I.. -I. -I../include"
 
 
 %install
@@ -43,12 +46,34 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc CHANGES COPYING README LINUX_LOGO.FAQ README* TODO USAGE
+%doc CHANGES COPYING LINUX_LOGO.FAQ README* TODO USAGE
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  4.13-1
+- Update to 4.13.
+
+* Sun May 22 2005 Jeremy Katz  - 4.12-2
+- rebuild on all arches
+
+* Mon May  2 2005 Matthias Saou  4.12-1
+- Update to 4.12.
+- Add trivial patch to remove stripping upon install, to get useful debuginfo.
+
+* Sat Apr 30 2005 Matthias Saou  4.11-1
+- Update to 4.11.
+
+* Sat Apr  2 2005 Matthias Saou  4.10-1
+- Update to 4.10.
+- Remove no longer needed gcc4 patch.
+- Get optflags also used during the compilation of libsysinfo.
+
+* Wed Mar 30 2005 Adrian Reber  4.09-3
+- Added gcc4 patch
+- Fixed a warning
+
 * Tue Nov 16 2004 Matthias Saou  4.09-2
 - Bump release to provide Extras upgrade path.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Nov 2004 02:47:49 -0000	1.3
+++ sources	9 Feb 2006 15:42:50 -0000	1.4
@@ -1 +1 @@
-ba970437da602e1dbb4c244303793cd6  linux_logo-4.09.tar.gz
+17af1e478ea9ac7dbcffd2e0a53aa5a6  linux_logo-4.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 15:42:56 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:42:56 -0500
Subject: rpms/linux_logo/FC-4 .cvsignore, 1.5, 1.6 linux_logo.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200602091543.k19FhSNk004185@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-serv4120/FC-4

Modified Files:
	.cvsignore linux_logo.spec sources 
Log Message:
Update to 4.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 May 2005 07:34:15 -0000	1.5
+++ .cvsignore	9 Feb 2006 15:42:56 -0000	1.6
@@ -1 +1 @@
-linux_logo-4.12.tar.gz
+linux_logo-4.13.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/FC-4/linux_logo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux_logo.spec	22 May 2005 23:02:43 -0000	1.9
+++ linux_logo.spec	9 Feb 2006 15:42:56 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 4.12
-Release: 2
+Version: 4.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  4.13-1
+- Update to 4.13.
+
 * Sun May 22 2005 Jeremy Katz  - 4.12-2
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 May 2005 07:34:15 -0000	1.5
+++ sources	9 Feb 2006 15:42:56 -0000	1.6
@@ -1 +1 @@
-727a92801656309e6ab703f8b2658fe2  linux_logo-4.12.tar.gz
+17af1e478ea9ac7dbcffd2e0a53aa5a6  linux_logo-4.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 15:43:02 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:43:02 -0500
Subject: rpms/linux_logo/devel .cvsignore, 1.5, 1.6 linux_logo.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200602091543.k19FhYg3004190@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore linux_logo.spec sources 
Log Message:
Update to 4.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 May 2005 07:34:15 -0000	1.5
+++ .cvsignore	9 Feb 2006 15:43:01 -0000	1.6
@@ -1 +1 @@
-linux_logo-4.12.tar.gz
+linux_logo-4.13.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/linux_logo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux_logo.spec	22 May 2005 23:02:43 -0000	1.9
+++ linux_logo.spec	9 Feb 2006 15:43:01 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 4.12
-Release: 2
+Version: 4.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  4.13-1
+- Update to 4.13.
+
 * Sun May 22 2005 Jeremy Katz  - 4.12-2
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 May 2005 07:34:15 -0000	1.5
+++ sources	9 Feb 2006 15:43:01 -0000	1.6
@@ -1 +1 @@
-727a92801656309e6ab703f8b2658fe2  linux_logo-4.12.tar.gz
+17af1e478ea9ac7dbcffd2e0a53aa5a6  linux_logo-4.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 15:48:35 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:48:35 -0500
Subject: rpms/lmarbles/devel lmarbles.spec,1.8,1.9
Message-ID: <200602091549.k19Fn7CJ004350@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	lmarbles.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: lmarbles.spec
===================================================================
RCS file: /cvs/extras/rpms/lmarbles/devel/lmarbles.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lmarbles.spec	11 Oct 2005 23:30:06 -0000	1.8
+++ lmarbles.spec	9 Feb 2006 15:48:35 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Atomix clone where you create figures out of marbles
 Name: lmarbles
 Version: 1.0.7
-Release: 3
+Release: 4
 License: GPL
 Group: Amusements/Games
 URL: http://lgames.sourceforge.net/
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.0.7-4
+- Rebuild for new gcc/glibc.
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.7-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Feb  9 15:50:30 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:50:30 -0500
Subject: rpms/linux_logo/FC-3 linux_logo-4.12-debug.patch,NONE,1.1
Message-ID: <200602091550.k19FoW9R004416@cvs-int.fedora.redhat.com>

Author: thias

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

Added Files:
	linux_logo-4.12-debug.patch 
Log Message:
Add missing patch.


linux_logo-4.12-debug.patch:

--- NEW FILE linux_logo-4.12-debug.patch ---
diff -Naupr linux_logo-4.12.orig/Makefile linux_logo-4.12/Makefile
--- linux_logo-4.12.orig/Makefile	2005-04-30 22:32:10.000000000 +0200
+++ linux_logo-4.12/Makefile	2005-05-10 00:05:53.000000000 +0200
@@ -88,7 +88,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
 



From fedora-extras-commits at redhat.com  Thu Feb  9 15:59:26 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 10:59:26 -0500
Subject: rpms/metakit/devel .cvsignore, 1.4, 1.5 metakit.spec, 1.11,
	1.12 sources, 1.4, 1.5 metakit-2.4.9.3-nostrip.patch, 1.1, NONE
Message-ID: <200602091559.k19FxwtH004499@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore metakit.spec sources 
Removed Files:
	metakit-2.4.9.3-nostrip.patch 
Log Message:
Update to 2.4.9.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metakit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Nov 2004 02:48:26 -0000	1.4
+++ .cvsignore	9 Feb 2006 15:59:26 -0000	1.5
@@ -1 +1 @@
-metakit-2.4.9.3.tar.gz
+metakit-2.4.9.5.tar.gz


Index: metakit.spec
===================================================================
RCS file: /cvs/extras/rpms/metakit/devel/metakit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- metakit.spec	26 May 2005 12:52:31 -0000	1.11
+++ metakit.spec	9 Feb 2006 15:59:26 -0000	1.12
@@ -2,17 +2,17 @@
 
 Summary: Embeddable database
 Name: metakit
-Version: 2.4.9.3
-Release: 8
+Version: 2.4.9.5
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.equi4.com/metakit/
 Source: http://www.equi4.com/pub/mk/metakit-%{version}.tar.gz
 Patch0: metakit-2.4.9.3-64bit.patch
-Patch1: metakit-2.4.9.3-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: tcl, python
 BuildRequires: gcc-c++, tcl-devel, python-devel
+BuildRequires: autoconf, automake, libtool
 
 %description
 MetaKit is an embeddable database which runs on Unix, Windows,
@@ -35,7 +35,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .64bit
-%patch1 -p1 -b .nostrip
 
 
 %build
@@ -71,19 +70,21 @@
 %doc README
 %{_libdir}/*.so
 %{_libdir}/python%{python_version}/site-packages/Mk4py.so
-%{_libdir}/python%{python_version}/site-packages/metakit.py
+%{_libdir}/python%{python_version}/site-packages/metakit.py*
 %{_prefix}/lib/tcl*/Mk4tcl/
 
 
 %files devel
 %defattr(-, root, root, 0755)
-%doc CHANGES WHATSNEW doc/
+%doc CHANGES doc/*
 %{_includedir}/*
-%exclude %{_libdir}/*.la
-%{_libdir}/*.a
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  2.4.9.5-1
+- Update to 2.4.9.5.
+- Remove no longer nostrip patch.
+
 * Thu May 26 2005 Matthias Saou  2.4.9.3-8
 - Move libraries back to _libdir (why lib32dir in the first place?) (#158586)
 - Move python module into site-packages/.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metakit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Nov 2004 02:48:26 -0000	1.4
+++ sources	9 Feb 2006 15:59:26 -0000	1.5
@@ -1 +1 @@
-89a25775fee5db536937f36deb5223f6  metakit-2.4.9.3.tar.gz
+37ba351462dad0d7f01394e04c173ce3  metakit-2.4.9.5.tar.gz


--- metakit-2.4.9.3-nostrip.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Feb  9 16:05:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 11:05:03 -0500
Subject: rpms/ncftp/devel ncftp.spec,1.5,1.6
Message-ID: <200602091605.k19G5ZaU006366@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ncftp.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/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	9 Feb 2006 16:05:03 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Improved console FTP client
 Name: ncftp
 Version: 3.1.9
-Release: 1
+Release: 2%{?dist}
 Epoch: 2
 License: Distributable
 Group: Applications/Internet
@@ -38,18 +38,18 @@
 
 %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 +71,9 @@
 
 
 %changelog
+* 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  Thu Feb  9 16:15:45 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 11:15:45 -0500
Subject: rpms/oidentd/devel identd.init, 1.2, 1.3 oidentd.spec, 1.8,
	1.9 identd.spoof, 1.1, NONE oidentd.users, 1.1, NONE
Message-ID: <200602091616.k19GGIuc006481@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	identd.init oidentd.spec 
Removed Files:
	identd.spoof oidentd.users 
Log Message:
Rebuild for new gcc/glibc, remove included obsolete configuration files.



Index: identd.init
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/identd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- identd.init	9 Nov 2004 02:48:57 -0000	1.2
+++ identd.init	9 Feb 2006 16:15:45 -0000	1.3
@@ -1,9 +1,9 @@
-#! /bin/sh
+#!/bin/sh
 # $Id$
 #
 # identd	Start/Stop RFC 1413 identd server
 #
-# chkconfig: 345 35 65
+# chkconfig: - 35 65
 # description:	The identd server provides a means to determine the identity \
 #		of a user of a particular TCP connection.  Given a TCP port \
 #		number pair, it returns a character string which identifies \
@@ -19,10 +19,7 @@
 . /etc/sysconfig/network
 
 # Check that networking is up.
-if [ ${NETWORKING} = "no" ]
-then
-	exit 0
-fi
+[ "${NETWORKING}" = "no" ] && exit 0
 
 [ -x /usr/sbin/oidentd ] || exit 0
 
@@ -30,7 +27,7 @@
 RETVAL=0
 
 start() {
-	echo -n "Starting identd: "
+	echo -n "Starting oidentd: "
 	daemon /usr/sbin/oidentd $IDENTDOPTS
 	RETVAL=$?
 	echo
@@ -39,8 +36,8 @@
 }
 
 stop() {
-	echo -n "Stopping identd services: "
-	killproc oidentd
+	echo -n "Stopping oidentd services: "
+	killproc /usr/sbin/oidentd
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/identd


Index: oidentd.spec
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/oidentd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- oidentd.spec	28 Jun 2005 17:31:35 -0000	1.8
+++ oidentd.spec	9 Feb 2006 16:15:45 -0000	1.9
@@ -1,18 +1,12 @@
-# $Id$
-# Upstream: Ryan McCabe 
-
 Summary: Implementation of the RFC1413 identification server
 Name: oidentd
 Version: 2.0.7
-Release: 7
-
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://ojnk.sourceforge.net/
 Source0: http://dl.sf.net/ojnk/oidentd-%{version}.tar.gz
 Source1: identd.init
-Source2: identd.spoof
-Source3: oidentd.users
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -43,9 +37,8 @@
 %install
 %{__rm} -rf %{buildroot}
 %makeinstall
-%{__install} -D -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/identd
-%{__install} -D -m 640 %{SOURCE2} %{buildroot}%{_sysconfdir}/identd.spoof
-%{__install} -D -m 640 %{SOURCE3} %{buildroot}%{_sysconfdir}/oidentd.users
+%{__install} -D -p -m 0755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/identd
+touch %{buildroot}%{_sysconfdir}/{oidentd.conf,oidentd_masq.conf}
 
 
 %clean
@@ -70,14 +63,20 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog* COPYING* NEWS README TODO doc/rfc1413
-%attr(0640, root, nobody) %config(noreplace) %{_sysconfdir}/identd.spoof
-%attr(0640, root, nobody) %config(noreplace) %{_sysconfdir}/oidentd.users
+%ghost %config %{_sysconfdir}/oidentd.conf
+%ghost %config %{_sysconfdir}/oidentd_masq.conf
 %config /etc/rc.d/init.d/identd
 %{_sbindir}/oidentd
 %{_mandir}/man?/*
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  2.0.7-8
+- Remove obsolete identd.spoof and oidentd.users files (thanks to Apu).
+- Ghost new configuration files (oidentd.conf & oidentd_masq.conf), but
+  including some sane defaults would be even better.
+- Cosmetic changes to the init file, and now default to disabled.
+
 * Sun May 22 2005 Jeremy Katz  - 2.0.7-7
 - rebuild on all arches
 


--- identd.spoof DELETED ---


--- oidentd.users DELETED ---



From fedora-extras-commits at redhat.com  Thu Feb  9 16:18:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 11:18:00 -0500
Subject: rpms/perl-Log-Log4perl - New directory
Message-ID: <200602091618.k19GI3K6006616@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6608/perl-Log-Log4perl

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




From fedora-extras-commits at redhat.com  Thu Feb  9 16:18:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 11:18:06 -0500
Subject: rpms/perl-Log-Log4perl/devel - New directory
Message-ID: <200602091618.k19GI8iY006631@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6608/perl-Log-Log4perl/devel

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




From fedora-extras-commits at redhat.com  Thu Feb  9 16:18:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 11:18:25 -0500
Subject: rpms/perl-Log-Log4perl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602091618.k19GIRqR006665@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6653

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb  9 16:18:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 11:18:30 -0500
Subject: rpms/perl-Log-Log4perl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200602091618.k19GIWa7006685@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6653/devel

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


--- NEW 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 Feb  9 16:19:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 11:19:10 -0500
Subject: rpms/perl-Log-Log4perl import.log,1.1,1.2
Message-ID: <200602091619.k19GJhYw006769@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6729

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Log4perl-1.03-1 on branch devel from perl-Log-Log4perl-1.03-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Feb 2006 16:18:24 -0000	1.1
+++ import.log	9 Feb 2006 16:19:10 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Log4perl-1_03-1:HEAD:perl-Log-Log4perl-1.03-1.src.rpm:1139501943



From fedora-extras-commits at redhat.com  Thu Feb  9 16:19:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 11:19:16 -0500
Subject: rpms/perl-Log-Log4perl/devel Log-Log4perl-1.01-032JRollFile.t.patch,
	NONE, 1.1 Log-Log4perl-1.01-Watch.pm.patch, NONE,
	1.1 perl-Log-Log4perl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200602091619.k19GJndk006773@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6729/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Log-Log4perl-1.01-032JRollFile.t.patch 
	Log-Log4perl-1.01-Watch.pm.patch perl-Log-Log4perl.spec 
Log Message:
auto-import perl-Log-Log4perl-1.03-1 on branch devel from perl-Log-Log4perl-1.03-1.src.rpm

Log-Log4perl-1.01-032JRollFile.t.patch:

--- NEW FILE Log-Log4perl-1.01-032JRollFile.t.patch ---
diff -ruN Log-Log4perl-1.01-orig/t/032JRollFile.t Log-Log4perl-1.01/t/032JRollFile.t
--- Log-Log4perl-1.01-orig/t/032JRollFile.t	2003-06-23 18:43:22.000000000 +0100
+++ Log-Log4perl-1.01/t/032JRollFile.t	2005-11-05 20:41:18.000000000 +0000
@@ -5,21 +5,21 @@
 #
 # We skip all tests for this module until it has stabilized.
 #
-BEGIN {
-    plan skip_all => "Log::Dispatch::FileRotate tests skipped";
-}
-
 #BEGIN {
-#    eval {
-#        require Log::Dispatch::FileRotate;
-#    };
-#    if ($@ or $Log::Dispatch::FileRotate::VERSION < 1.10) {
-#        plan skip_all => "only with Log::Dispatch::FileRotate 1.10";
-#    } else {
-#        plan tests => 2;
-#    }
+#    plan skip_all => "Log::Dispatch::FileRotate tests skipped";
 #}
 
+BEGIN {
+    eval {
+        require Log::Dispatch::FileRotate;
+    };
+    if ($@ or $Log::Dispatch::FileRotate::VERSION < 1.10) {
+        plan skip_all => "only with Log::Dispatch::FileRotate 1.10";
+    } else {
+        plan tests => 2;
+    }
+}
+
 my $WORK_DIR = "tmp";
 if(-d "t") {
     $WORK_DIR = File::Spec->catfile(qw(t tmp));

Log-Log4perl-1.01-Watch.pm.patch:

--- NEW FILE Log-Log4perl-1.01-Watch.pm.patch ---
diff -ruN Log-Log4perl-1.01-orig/lib/Log/Log4perl/Config/Watch.pm Log-Log4perl-1.01/lib/Log/Log4perl/Config/Watch.pm
--- Log-Log4perl-1.01-orig/lib/Log/Log4perl/Config/Watch.pm	2004-10-17 00:00:47.000000000 +0100
+++ Log-Log4perl-1.01/lib/Log/Log4perl/Config/Watch.pm	2005-12-17 19:51:37.000000000 +0000
@@ -1,8 +1,3 @@
-#!/usr/bin/perl
-###########################################
-use warnings;
-use strict;
-
 package Log::Log4perl::Config::Watch;
 
 use constant _INTERNAL_DEBUG => 0;


--- NEW FILE perl-Log-Log4perl.spec ---
#
# Rebuild options:
#
#  --with filerotate                 # With perl(Log::Dispatch::FileRotate)
#

%define log_dispatch_filerotate 0

%{?_with_filerotate:%define log_dispatch_filerotate 1}

Name:           perl-Log-Log4perl
Version:        1.03
Release:        1%{?dist}
Summary:        Log4j implementation for Perl

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://log4perl.sourceforge.net/
Source0:        http://log4perl.sourceforge.net/releases/Log-Log4perl-%{version}.tar.gz
Patch0:         Log-Log4perl-1.01-Watch.pm.patch
Patch1:         Log-Log4perl-1.01-032JRollFile.t.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(IPC::Shareable)
BuildRequires:  perl(Log::Dispatch)
%if %{log_dispatch_filerotate}
BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
%endif
BuildRequires:  perl(SQL::Statement)
BuildRequires:  perl(DBD::CSV)
BuildRequires:  perl(XML::DOM)
BuildRequires:  rrdtool
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Log::Log4perl lets you remote-control and fine-tune the logging
behaviour of your system from the outside. It implements the widely
popular (Java-based) Log4j logging package in pure Perl.


%prep
%setup -q -n Log-Log4perl-%{version}
%patch0 -p1
%if %{log_dispatch_filerotate}
%patch1 -p1
%endif
find lib -name "*.pm" -exec chmod a-x {} ';'
chmod a-x eg/* 

%if !%{log_dispatch_filerotate}
# Requirements list: exclude perl(Log::Dispatch::FileRotate) >= 1.10

cat <<__EOF__ > %{name}-perlreq
#!/bin/sh
/usr/lib/rpm/perl.req \$* | grep -v '^perl(Log::Dispatch::FileRotate)'
__EOF__

%define __perl_requires %{_builddir}/Log-Log4perl-%{version}/%{name}-perlreq
chmod +x %{__perl_requires}
%endif


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
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 L4P_ALL_TESTS=1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README eg/ ldap/
%{perl_vendorlib}/Log/
%{_mandir}/man3/*.3*


%changelog
* Tue Feb  7 2006 Jose Pedro Oliveira  - 1.03-1
- Update to 1.03.
- Disable Log::Dispatch::FileRotate requirement.

* Mon Dec 19 2005 Jose Pedro Oliveira  - 1.02-1
- Update to 1.02.

* Sat Oct 22 2005 Jose Pedro Oliveira  - 1.01-1
- Update to 1.01.

* Sun Sep 11 2005 Jose Pedro Oliveira  - 1.00-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Feb 2006 16:18:30 -0000	1.1
+++ .cvsignore	9 Feb 2006 16:19:16 -0000	1.2
@@ -0,0 +1 @@
+Log-Log4perl-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Feb 2006 16:18:30 -0000	1.1
+++ sources	9 Feb 2006 16:19:16 -0000	1.2
@@ -0,0 +1 @@
+2b471ec7e844a2b603239c3808155b56  Log-Log4perl-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 16:38:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 11:38:09 -0500
Subject: rpms/perl-Log-Log4perl/devel perl-Log-Log4perl.spec,1.1,1.2
Message-ID: <200602091638.k19Gcg3t006876@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6849

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
Added a couple of comments to the sepcfile.


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Log4perl.spec	9 Feb 2006 16:19:16 -0000	1.1
+++ perl-Log-Log4perl.spec	9 Feb 2006 16:38:09 -0000	1.2
@@ -10,11 +10,12 @@
 
 Name:           perl-Log-Log4perl
 Version:        1.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
+# CPAN URL:     http://search.cpan.org/dist/Log-Log4perl/
 URL:            http://log4perl.sourceforge.net/
 Source0:        http://log4perl.sourceforge.net/releases/Log-Log4perl-%{version}.tar.gz
 Patch0:         Log-Log4perl-1.01-Watch.pm.patch
@@ -30,7 +31,8 @@
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
-BuildRequires:  rrdtool
+# perl(RRDs) is provided by the rrdtool package
+BuildRequires:  perl(RRDs)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -90,9 +92,12 @@
 
 
 %changelog
+* Thu Feb  9 2006 Jose Pedro Oliveira  - 1.03-2
+- Added a couple of comments as suggested by Paul Howarth (#176137).
+
 * Tue Feb  7 2006 Jose Pedro Oliveira  - 1.03-1
 - Update to 1.03.
-- Disable Log::Dispatch::FileRotate requirement.
+- Disabled the Log::Dispatch::FileRotate requirement (see #171640).
 
 * Mon Dec 19 2005 Jose Pedro Oliveira  - 1.02-1
 - Update to 1.02.



From fedora-extras-commits at redhat.com  Thu Feb  9 16:39:46 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu,  9 Feb 2006 11:39:46 -0500
Subject: rpms/ufsparse/devel sources, 1.4, 1.5 ufsparse.spec, 1.8,
	1.9 ufsparse-0.92-Makefile-patch, 1.1, NONE
Message-ID: <200602091640.k19GeJgE006903@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	sources ufsparse.spec 
Removed Files:
	ufsparse-0.92-Makefile-patch 
Log Message:
New release. Remove old patch.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Dec 2005 15:55:19 -0000	1.4
+++ sources	9 Feb 2006 16:39:46 -0000	1.5
@@ -1 +1 @@
-8fabcd1b918612cb181bd8935d728ca2  UFsparse.tar.gz
+534abf5e6f6ab58dbeaf6154fc31ec61  UFsparse.tar.gz


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ufsparse.spec	19 Dec 2005 20:32:36 -0000	1.8
+++ ufsparse.spec	9 Feb 2006 16:39:46 -0000	1.9
@@ -1,13 +1,12 @@
 Name:           ufsparse
-Version:        0.92
-Release:        2%{?dist}
+Version:        0.93
+Release:        1%{?dist}
 Summary:        University of Florida sparse matrix libraries
 
 Group:          System Environment/Libraries
 License:        Distributable
 URL:            http://www.cise.ufl.edu/research/sparse/umfpack/
 Source0:        http://www.cise.ufl.edu/research/sparse/beta/Dec8_2005/UFsparse.tar.gz
-Patch0:         ufsparse-0.92-Makefile-patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -39,8 +38,6 @@
 
 %prep
 %setup -q -n UFsparse
-%patch -p0
-chmod -R a+r *
 
 %build
 %define amd_version 1.2
@@ -235,6 +232,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Thu Feb  9 2006 Quentin Spencer  0.93-1
+- New release. Remove old patch.
+
 * Wed Dec 14 2005 Quentin Spencer  0.92-2
 - Add patch0--fixes LDL/Makefile so CFLAGS are used when compiling ldl.a.
 


--- ufsparse-0.92-Makefile-patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Feb  9 16:42:46 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu,  9 Feb 2006 11:42:46 -0500
Subject: rpms/ufsparse/devel ufsparse.spec,1.9,1.10
Message-ID: <200602091643.k19GhKYj006998@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	ufsparse.spec 
Log Message:
Update URL.


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ufsparse.spec	9 Feb 2006 16:39:46 -0000	1.9
+++ ufsparse.spec	9 Feb 2006 16:42:46 -0000	1.10
@@ -5,8 +5,8 @@
 
 Group:          System Environment/Libraries
 License:        Distributable
-URL:            http://www.cise.ufl.edu/research/sparse/umfpack/
-Source0:        http://www.cise.ufl.edu/research/sparse/beta/Dec8_2005/UFsparse.tar.gz
+URL:            http://www.cise.ufl.edu/research/sparse/UFsparse/
+Source0:        http://www.cise.ufl.edu/research/sparse/UFsparse/Jan28_2006/UFsparse.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel



From fedora-extras-commits at redhat.com  Thu Feb  9 16:44:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  9 Feb 2006 11:44:10 -0500
Subject: owners owners.list,1.625,1.626
Message-ID: <200602091644.k19GigK5007039@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	owners.list 
Log Message:
New package: Log4j implementation for Perl (#176137).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- owners.list	9 Feb 2006 13:40:17 -0000	1.625
+++ owners.list	9 Feb 2006 16:44:09 -0000	1.626
@@ -888,6 +888,7 @@
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Log4perl|Log4j implementation for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-GnuPG|Process email with GPG|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Mbox-MessageParser|A fast and simple mbox folder reader|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Feb  9 16:49:43 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 11:49:43 -0500
Subject: rpms/p7zip/devel p7zip_4.30-extraqualif.patch, NONE, 1.1 p7zip.spec,
	1.7, 1.8
Message-ID: <200602091650.k19GoFeB007126@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	p7zip.spec 
Added Files:
	p7zip_4.30-extraqualif.patch 
Log Message:
Rebuild for new gcc/glibc.


p7zip_4.30-extraqualif.patch:

--- NEW FILE p7zip_4.30-extraqualif.patch ---
diff -Naupr p7zip_4.30.orig/7zip/Archive/7z/7zIn.h p7zip_4.30/7zip/Archive/7z/7zIn.h
--- p7zip_4.30.orig/7zip/Archive/7z/7zIn.h	2005-09-22 19:53:23.000000000 +0200
+++ p7zip_4.30/7zip/Archive/7z/7zIn.h	2006-02-09 17:25:37.000000000 +0100
@@ -244,7 +244,7 @@ private:
       CRecordVector &digestsDefined, 
       CRecordVector &digests);
 
-  HRESULT CInArchive::ReadStreamsInfo(
+  HRESULT ReadStreamsInfo(
       const CObjectVector *dataVector,
       UInt64 &dataOffset,
       CRecordVector &packSizes,
diff -Naupr p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder1.h p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h
--- p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder1.h	2005-09-22 19:53:21.000000000 +0200
+++ p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h	2006-02-09 17:30:32.000000000 +0100
@@ -58,7 +58,7 @@ class CCoder :
   UInt32 c_table[CTABLESIZE];
   UInt32 pt_table[PTABLESIZE];
   
-  void CCoder::ReleaseStreams()
+  void ReleaseStreams()
   {
     m_OutWindowStream.ReleaseStream();
     m_InBitStream.ReleaseStream();
diff -Naupr p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder2.h p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h
--- p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder2.h	2005-09-22 19:53:21.000000000 +0200
+++ p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h	2006-02-09 17:27:38.000000000 +0100
@@ -26,7 +26,7 @@ class CCoder :
   CLZOutWindow m_OutWindowStream;
   NStream::NMSBF::CDecoder m_InBitStream;
   
-  void CCoder::ReleaseStreams()
+  void ReleaseStreams()
   {
     m_OutWindowStream.ReleaseStream();
     m_InBitStream.ReleaseStream();
@@ -62,4 +62,4 @@ public:
 
 }}}
 
-#endif
\ No newline at end of file
+#endif
diff -Naupr p7zip_4.30.orig/7zip/Compress/Deflate/DeflateDecoder.h p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h
--- p7zip_4.30.orig/7zip/Compress/Deflate/DeflateDecoder.h	2005-09-22 19:53:20.000000000 +0200
+++ p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h	2006-02-09 17:23:19.000000000 +0100
@@ -60,7 +60,7 @@ class CCoder:
   void DeCodeLevelTable(Byte *newLevels, int numLevels);
   bool ReadTables();
   
-  void CCoder::ReleaseStreams()
+  void ReleaseStreams()
   {
     m_OutWindowStream.ReleaseStream();
     ReleaseInStream();
diff -Naupr p7zip_4.30.orig/7zip/Compress/Deflate/DeflateEncoder.h p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h
--- p7zip_4.30.orig/7zip/Compress/Deflate/DeflateEncoder.h	2005-11-19 22:09:02.000000000 +0100
+++ p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h	2006-02-09 17:32:27.000000000 +0100
@@ -115,7 +115,7 @@ class CCoder
   void CopyBackBlockOp(UInt32 distance, UInt32 length);
   void WriteBlockData(bool writeMode, bool finalBlock);
 
-  void CCoder::ReleaseStreams()
+  void ReleaseStreams()
   {
     // m_MatchFinder.ReleaseStream();
     m_OutStream.ReleaseStream();
diff -Naupr p7zip_4.30.orig/7zip/Compress/Lzh/LzhDecoder.h p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h
--- p7zip_4.30.orig/7zip/Compress/Lzh/LzhDecoder.h	2005-09-22 19:53:21.000000000 +0200
+++ p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h	2006-02-09 17:37:56.000000000 +0100
@@ -53,7 +53,7 @@ class CCoder :
   CHuffmanDecoder m_PHuffmanDecoder;
   CHuffmanDecoder m_CHuffmanDecoder;
 
-  void CCoder::ReleaseStreams()
+  void ReleaseStreams()
   {
     m_OutWindowStream.ReleaseStream();
     m_InBitStream.ReleaseStream();
diff -Naupr p7zip_4.30.orig/7zip/UI/Console/ExtractCallbackConsole.h p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h
--- p7zip_4.30.orig/7zip/UI/Console/ExtractCallbackConsole.h	2005-09-22 19:53:22.000000000 +0200
+++ p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h	2006-02-09 17:20:16.000000000 +0100
@@ -52,7 +52,7 @@ public:
 
   CStdOutStream *OutStream;
 
-  void CExtractCallbackConsole::Init()
+  void Init()
   {
     NumArchives = 0;
     NumArchiveErrors = 0;


Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- p7zip.spec	28 Nov 2005 15:09:10 -0000	1.7
+++ p7zip.spec	9 Feb 2006 16:49:43 -0000	1.8
@@ -1,11 +1,12 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
 Version: 4.30
-Release: 1%{?dist}
+Release: 2%{?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
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++
 
@@ -26,6 +27,7 @@
 
 %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}.
@@ -88,6 +90,10 @@
 
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 16:52:50 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 11:52:50 -0500
Subject: rpms/perl-libintl/devel .cvsignore, 1.2, 1.3 perl-libintl.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200602091653.k19GrMAb007198@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore perl-libintl.spec sources 
Log Message:
Update to 1.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-libintl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jan 2005 16:43:45 -0000	1.2
+++ .cvsignore	9 Feb 2006 16:52:49 -0000	1.3
@@ -1 +1 @@
-libintl-perl-1.11.tar.gz
+libintl-perl-1.16.tar.gz


Index: perl-libintl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-libintl/devel/perl-libintl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-libintl.spec	6 Apr 2005 22:13:29 -0000	1.2
+++ perl-libintl.spec	9 Feb 2006 16:52:49 -0000	1.3
@@ -4,9 +4,8 @@
 
 Summary: Internationalization library for Perl, compatible with gettext
 Name: perl-libintl
-Version: 1.11
-Release: 3
-
+Version: 1.16
+Release: 1%{?dist}
 License: LGPL
 Group: Applications/CPAN
 URL: http://search.cpan.org/dist/libintl-perl/
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.16-1
+- Update to 1.16.
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-libintl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jan 2005 16:43:45 -0000	1.2
+++ sources	9 Feb 2006 16:52:49 -0000	1.3
@@ -1 +1 @@
-091e05542e36f030c785f2919f05b73f  libintl-perl-1.11.tar.gz
+7dfcd9ac3a4ff41038a2c67a733d42b9  libintl-perl-1.16.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 17:12:26 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 12:12:26 -0500
Subject: rpms/php-eaccelerator/devel .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: <200602091712.k19HCwmu009114@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9088

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Removed Files:
	eaccelerator-0.9.3-buffer-overflow.patch 
Log Message:
Update to latest PHP 5.1 compatible snapshot, there is no other option for now.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2005 09:01:08 -0000	1.3
+++ .cvsignore	9 Feb 2006 17:12:20 -0000	1.4
@@ -1 +1 @@
-eaccelerator-0.9.3.tar.gz
+eaccelerator-5.1-cvs200602071647.tar.gz


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/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:38 -0000	1.7
+++ php-eaccelerator.spec	9 Feb 2006 17:12:24 -0000	1.8
@@ -1,17 +1,18 @@
 %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 4.4.1)}
 
 %define module_version 0.9.3
+%define prever         cvs200602071647
 
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 4%{?dist}
+Release: 0.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.gz
+Source: http://snapshots.eaccelerator.net/eaccelerator-5.1-%{prever}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: php = %{php_version}
 Provides: php-zend_extension
@@ -27,8 +28,8 @@
 
 
 %prep
-%setup -n eaccelerator-%{module_version}
-%patch -p1
+#setup -n eaccelerator-%{module_version}
+%setup -n eaccelerator-5.1-%{prever}
 
 
 %build
@@ -85,10 +86,14 @@
 %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
+* Thu Feb  9 2006 Matthias Saou  5.1.x_0.9.3-0.1
+- Update to 5.1.x compatible snapshot.
+- Will try to make re2c available in Extras in order to build require it.
+
 * 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/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2005 09:01:08 -0000	1.3
+++ sources	9 Feb 2006 17:12:24 -0000	1.4
@@ -1 +1 @@
-b17ddf953f18ee6df5c2c24ffccb37d9  eaccelerator-0.9.3.tar.gz
+6ad0cd6244c8bb165367c848e14dd382  eaccelerator-5.1-cvs200602071647.tar.gz


--- eaccelerator-0.9.3-buffer-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Feb  9 17:16:15 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 12:16:15 -0500
Subject: rpms/php-pecl-mailparse/devel php-pecl-mailparse.spec,1.7,1.8
Message-ID: <200602091716.k19HGlAt009219@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-pecl-mailparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9179

Modified Files:
	php-pecl-mailparse.spec 
Log Message:
Rebuild for new gcc/glibc and FC5's PHP 5.1.



Index: php-pecl-mailparse.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-mailparse/devel/php-pecl-mailparse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pecl-mailparse.spec	7 Nov 2005 12:55:25 -0000	1.7
+++ php-pecl-mailparse.spec	9 Feb 2006 17:16:15 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: PECL package for parsing and working with email messages
 Name: php-pecl-mailparse
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://pecl.php.net/package/mailparse
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  2.1.1-2
+- Rebuild for new gcc/glibc and FC5's PHP 5.1.
+
 * Wed Jul 20 2005 Matthias Saou  2.1.1-1
 - Update to 2.1.1.
 - Update mbfl tarball to 4.4.0 PHP sources.



From fedora-extras-commits at redhat.com  Thu Feb  9 17:22:04 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 12:22:04 -0500
Subject: rpms/php-pecl-pdo/devel .cvsignore, 1.2, 1.3 php-pecl-pdo.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200602091722.k19HMarP009321@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-serv9300

Modified Files:
	.cvsignore php-pecl-pdo.spec sources 
Log Message:
Update to 1.0.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-pdo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 May 2005 14:23:24 -0000	1.2
+++ .cvsignore	9 Feb 2006 17:22:03 -0000	1.3
@@ -1 +1 @@
-PDO-0.3.tgz
+PDO-1.0.2.tgz


Index: php-pecl-pdo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-pdo/devel/php-pecl-pdo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pecl-pdo.spec	2 Jun 2005 12:11:04 -0000	1.2
+++ php-pecl-pdo.spec	9 Feb 2006 17:22:03 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary: PECL package for PHP Data Objects Interface
 Name: php-pecl-pdo
-Version: 0.3
-Release: 2%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://pecl.php.net/package/PDO
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.0.2-1
+- Update to 1.0.2.
+
 * Thu Jun  2 2005 Matthias Saou  0.3-2
 - Move phpize from setup to build. Silly copy/paste error.
 - Remove execution bit from all files in the source tree.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-pdo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 May 2005 14:23:24 -0000	1.2
+++ sources	9 Feb 2006 17:22:03 -0000	1.3
@@ -1 +1 @@
-5a0ad6ce920091798b2656244cad71a9  PDO-0.3.tgz
+171ab47eb4251ae1f3209e5919857792  PDO-1.0.2.tgz



From fedora-extras-commits at redhat.com  Thu Feb  9 18:06:42 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 13:06:42 -0500
Subject: rpms/plib16/devel plib16.spec,1.6,1.7
Message-ID: <200602091807.k19I7GO9019674@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	plib16.spec 
Log Message:
Rebuild for new gcc/glibc and modular X.



Index: plib16.spec
===================================================================
RCS file: /cvs/extras/rpms/plib16/devel/plib16.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plib16.spec	23 May 2005 10:43:19 -0000	1.6
+++ plib16.spec	9 Feb 2006 18:06:41 -0000	1.7
@@ -1,15 +1,21 @@
-# $Id$
-
 Summary: Set of portable libraries especially useful for games
 Name: plib16
 Version: 1.6.0
-Release: 3
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://plib.sourceforge.net/
 Source: http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, Mesa-devel, freeglut-devel, libpng-devel
+BuildRequires: gcc-c++, freeglut-devel, libpng-devel
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel, Mesa-devel
+%else
+BuildRequires: libX11-devel, libXext-devel, libXi-devel, libXmu-devel
+Buildrequires: libSM-devel
+Buildrequires: mesa-libGL-devel, mesa-libGLU-devel
+%endif
 
 %description
 This is a set of OpenSource (LGPL) libraries that will permit programmers
@@ -58,6 +64,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.6.0-4
+- Rebuild for new gcc/glibc.
+
 * Sun May 22 2005 Jeremy Katz  - 1.6.0-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Feb  9 18:06:59 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 13:06:59 -0500
Subject: rpms/plib/devel plib-1.8.4-extraqualif.patch, NONE, 1.1 plib.spec,
	1.8, 1.9
Message-ID: <200602091807.k19I7WGE019677@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	plib.spec 
Added Files:
	plib-1.8.4-extraqualif.patch 
Log Message:
Rebuild for new gcc/glibc and modular X.


plib-1.8.4-extraqualif.patch:

--- NEW FILE plib-1.8.4-extraqualif.patch ---
diff -Naupr plib-1.8.4.orig/src/ssgAux/ssgaSky.h plib-1.8.4/src/ssgAux/ssgaSky.h
--- plib-1.8.4.orig/src/ssgAux/ssgaSky.h	2003-09-26 16:54:20.000000000 +0200
+++ plib-1.8.4/src/ssgAux/ssgaSky.h	2006-02-09 18:59:30.000000000 +0100
@@ -104,7 +104,7 @@ public:
   ssgaCelestialBodyList ( int init = 3 )
 	  : ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { }
 
-  ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); }
+  ~ssgaCelestialBodyList () { removeAll(); }
 
   int getNum (void) { return total ; }
 
@@ -192,7 +192,7 @@ public:
   ssgaCloudLayerList ( int init = 3 )
 	  : ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { }
 
-  ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); }
+  ~ssgaCloudLayerList () { removeAll(); }
 
   int getNum (void) { return total ; }
 


Index: plib.spec
===================================================================
RCS file: /cvs/extras/rpms/plib/devel/plib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plib.spec	27 Jun 2005 11:45:59 -0000	1.8
+++ plib.spec	9 Feb 2006 18:06:59 -0000	1.9
@@ -1,13 +1,22 @@
 Summary: Set of portable libraries especially useful for games
 Name: plib
 Version: 1.8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://plib.sourceforge.net/
 Source: http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
+Patch0: plib-1.8.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, Mesa-devel, freeglut-devel, libpng-devel
+BuildRequires: gcc-c++, freeglut-devel, libpng-devel
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel, Mesa-devel
+%else
+BuildRequires: libX11-devel, libXext-devel, libXi-devel, libXmu-devel
+Buildrequires: libSM-devel
+Buildrequires: mesa-libGL-devel, mesa-libGLU-devel
+%endif
 
 %description
 This is a set of OpenSource (LGPL) libraries that will permit programmers
@@ -32,6 +41,7 @@
 
 %prep
 %setup
+%patch0 -p1 -b .extraqualif
 
 
 %build
@@ -56,6 +66,10 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.8.4-2
+- Rebuild for new gcc/glibc and modular X.
+- Include gcc 4.1 patch to fix extra qualification errors.
+
 * Mon Jun 27 2005 Matthias Saou  1.8.4-1
 - Update to 1.8.4.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 18:12:51 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  9 Feb 2006 13:12:51 -0500
Subject: rpms/kawa/devel kawa.spec,1.4,1.5
Message-ID: <200602091813.k19IDOjs019794@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	kawa.spec 
Log Message:
Revision -4.  Rebuild with new 4.1 compiler (post ABI change)



Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kawa.spec	15 Dec 2005 06:50:06 -0000	1.4
+++ kawa.spec	9 Feb 2006 18:12:50 -0000	1.5
@@ -5,7 +5,7 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -84,6 +84,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb  9 2006 Anthony Green  - 1:1.8-4
+- Rebuild with new 4.1 compiler (post ABI change).
+
 * Wed Nov 14 2005 Anthony Green  - 1:1.8-3
 - Rebuild with GCC 4.1.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 18:14:00 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 13:14:00 -0500
Subject: rpms/portaudio/devel portaudio.spec,1.6,1.7
Message-ID: <200602091814.k19IEXIV019860@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	portaudio.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: portaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/portaudio/devel/portaudio.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- portaudio.spec	23 May 2005 10:45:35 -0000	1.6
+++ portaudio.spec	9 Feb 2006 18:13:58 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: Free, cross platform, open-source, audio I/O library
 Name: portaudio
 Version: 18.1
-Release: 5
+Release: 6%{?dist}
 License: BSD-like
 Group: System Environment/Libraries
 URL: http://www.portaudio.com/
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  18.1-6
+- Rebuild for new gcc/glibc.
+
 * Sun May 22 2005 Jeremy Katz  - 18.1-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Feb  9 18:25:24 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 13:25:24 -0500
Subject: rpms/powermanga/devel powermanga.spec,1.8,1.9
Message-ID: <200602091825.k19IPuK7019981@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	powermanga.spec 
Log Message:
Rebuild for new gcc/glibc and modular X.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- powermanga.spec	7 Nov 2005 12:08:11 -0000	1.8
+++ powermanga.spec	9 Feb 2006 18:25:23 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.79
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -10,6 +10,11 @@
 Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+%else
+BuildRequires: libXxf86dga-devel, libXxf86vm-devel
+%endif
 
 %description
 Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
@@ -89,6 +94,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  0.79-7
+- Rebuild for new gcc/glibc and modular X.
+
 * Mon Nov  7 2005 Matthias Saou  0.79-6
 - Fix stripping (when g+s is set, it doesn't happen) and add wrapper script in
   $PATH (#165313, Ville Skytt??).



From fedora-extras-commits at redhat.com  Thu Feb  9 18:30:16 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 13:30:16 -0500
Subject: rpms/proftpd/devel .cvsignore, 1.5, 1.6 proftpd.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200602091830.k19IUnxn020054@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore proftpd.spec sources 
Log Message:
Update to 1.3.0rc3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Dec 2004 18:00:15 -0000	1.5
+++ .cvsignore	9 Feb 2006 18:30:16 -0000	1.6
@@ -1 +1 @@
-proftpd-1.2.10.tar.bz2
+proftpd-1.3.0rc3.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- proftpd.spec	17 Nov 2005 12:46:50 -0000	1.10
+++ proftpd.spec	9 Feb 2006 18:30:16 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.2.10
-Release: 7%{?_with_ldap:_ldap}%{?_with_mysql:_mysql}%{?_with_postgresql:_pgsql}%{?dist}
+Version: 1.3.0
+Release: 0.1.rc3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc3.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -38,11 +38,11 @@
 
 Available rpmbuild rebuild options :
 --without : tls
---with : ldap mysql postgresql
+--with : ldap mysql postgresql ipv6
 
 
 %prep
-%setup
+%setup -n %{name}-%{version}rc3
 
 
 %build
@@ -64,6 +64,7 @@
 %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}
@@ -75,12 +76,16 @@
 %makeinstall rundir="%{buildroot}%{_localstatedir}/run/proftpd" \
     INSTALL_USER=`id -un` \
     INSTALL_GROUP=`id -gn`
-%{__install} -D -m 640 %{SOURCE1} %{buildroot}%{_sysconfdir}/proftpd.conf
-%{__install} -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
-%{__install} -D -m 640 %{SOURCE3} %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
-%{__install} -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/proftpd
-%{__install} -D -m 644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
-%{__install} -D -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
+%{__install} -D -p -m 640 %{SOURCE1} \
+    %{buildroot}%{_sysconfdir}/proftpd.conf
+%{__install} -D -p -m 755 %{SOURCE2} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
+%{__install} -D -p -m 640 %{SOURCE3} \
+    %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
+%{__install} -D -p -m 644 %{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
 %{__mkdir_p} %{buildroot}/var/ftp/uploads
 %{__mkdir_p} %{buildroot}/var/ftp/pub
 %{__mkdir_p} %{buildroot}/var/log/proftpd
@@ -140,8 +145,11 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.3.0-0.1.rc3
+- Update to 1.3.0rc3, which builds with the latest openssl.
+
 * Thu Nov 17 2005 Matthias Saou  1.2.10-7
-- Rebuild against new openssl library.
+- Rebuild against new openssl library... not.
 
 * Wed Jul 13 2005 Matthias Saou  1.2.10-6
 - The provided pam.d file no longer works, use our own based on the one from


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Dec 2004 18:00:15 -0000	1.5
+++ sources	9 Feb 2006 18:30:16 -0000	1.6
@@ -1 +1 @@
-5feb4a7348e12faefc25e34fd92efdd6  proftpd-1.2.10.tar.bz2
+050c3e2caec0d930f8a331e7b3ec0931  proftpd-1.3.0rc3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Feb  9 18:35:25 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Thu,  9 Feb 2006 13:35:25 -0500
Subject: rpms/pbzip2 import.log,1.5,1.6
Message-ID: <200602091835.k19IZvQg020180@cvs-int.fedora.redhat.com>

Author: jeffg

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	3 Jan 2006 16:09:12 -0000	1.5
+++ import.log	9 Feb 2006 18:35:25 -0000	1.6
@@ -2,3 +2,4 @@
 pbzip2-0_9_5-1:HEAD:pbzip2-0.9.5-1.src.rpm:1136303439
 pbzip2-0_9_5-1:FC-3:pbzip2-0.9.5-1.src.rpm:1136304021
 pbzip2-0_9_5-1:FC-4:pbzip2-0.9.5-1.src.rpm:1136304536
+pbzip2-0_9_6-1:HEAD:pbzip2-0.9.6-1.src.rpm:1139510121



From fedora-extras-commits at redhat.com  Thu Feb  9 18:35:31 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Thu,  9 Feb 2006 13:35:31 -0500
Subject: rpms/pbzip2/devel .cvsignore, 1.3, 1.4 pbzip2.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200602091836.k19Ia3DG020191@cvs-int.fedora.redhat.com>

Author: jeffg

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jan 2006 15:50:52 -0000	1.3
+++ .cvsignore	9 Feb 2006 18:35:31 -0000	1.4
@@ -1 +1 @@
-pbzip2-0.9.5.tar.gz
+pbzip2-0.9.6.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/pbzip2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pbzip2.spec	3 Jan 2006 15:50:52 -0000	1.2
+++ pbzip2.spec	9 Feb 2006 18:35:31 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		pbzip2
-Version:	0.9.5
+Version:	0.9.6
 Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Sun Feb 5 2006 Jeff Gilchrist  - 0.9.6-1
+- Release 0.9.6
+
 * Sat Dec 31 2005 Jeff Gilchrist  - 0.9.5-1
 - Release 0.9.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2006 15:50:52 -0000	1.3
+++ sources	9 Feb 2006 18:35:31 -0000	1.4
@@ -1 +1 @@
-94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz
+851800855b2cf0c84b6169554b562ff2  pbzip2-0.9.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 18:35:53 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 13:35:53 -0500
Subject: rpms/SDL_gfx/devel SDL_gfx.spec,1.3,1.4
Message-ID: <200602091836.k19IaP5f020225@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	SDL_gfx.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: SDL_gfx.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_gfx/devel/SDL_gfx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SDL_gfx.spec	6 Apr 2005 22:10:46 -0000	1.3
+++ SDL_gfx.spec	9 Feb 2006 18:35:53 -0000	1.4
@@ -1,12 +1,11 @@
 Summary: Graphic primitives, rotozoomer, framerate control and image filters
 Name: SDL_gfx
 Version: 2.0.13
-Release: 2
-
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
-URL: http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/
-Source: http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-%{version}.tar.gz
+URL: http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+Source: http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: SDL-devel, gcc-c++, automake, autoconf, perl
 
@@ -53,27 +52,30 @@
 %{__rm} -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-, root, root, 0755)
 %doc NEWS LICENSE README AUTHORS COPYING
-%{_libdir}/lib*.so.*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root, 0755)
-%{_libdir}/*.a
 %{_includedir}/SDL/*.h
+%exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  2.0.13-3
+- Rebuild for new gcc/glibc.
+- Update URLs.
+- Exclude the static library.
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Feb  9 18:39:12 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 13:39:12 -0500
Subject: rpms/starfighter/devel starfighter.spec,1.6,1.7
Message-ID: <200602091839.k19IdiOA020298@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	starfighter.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: starfighter.spec
===================================================================
RCS file: /cvs/extras/rpms/starfighter/devel/starfighter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- starfighter.spec	22 May 2005 23:43:03 -0000	1.6
+++ starfighter.spec	9 Feb 2006 18:39:11 -0000	1.7
@@ -1,22 +1,16 @@
-%{?dist: %{expand: %%define %dist 1}}
-
-%{?el2:%define _without_freedesktop 1}
-%{?rh7:%define _without_freedesktop 1}
-
 Summary: Project: Starfighter, a space arcade game
 Name: starfighter
 Version: 1.1
-Release: 5
-
+Release: 6%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.parallelrealities.co.uk/starfighter.php
+# No absolute URL since the home page tunnels it through a PHP script
 Source0: starfighter-%{version}-1.tar.bz2
 Source1: starfighter.png
 Patch: starfighter-1.1-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel
-%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, desktop-file-utils
 
 %description
 After decades of war one company, who had gained powerful supplying both sides
@@ -61,16 +55,11 @@
 Encoding=UTF-8
 EOF
 
-%if 0%{!?_without_freedesktop:1}
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
-%else
-%{__install} -D -m 0644 %{name}.desktop \
-    %{buildroot}%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
 
 
 %clean
@@ -83,14 +72,14 @@
 %{_prefix}/games/starfighter
 %{_prefix}/share/games/starfighter
 %{_datadir}/pixmaps/starfighter.png
-%if %{!?_without_freedesktop:1}0
 %{_datadir}/applications/fedora-%{name}.desktop
-%else
-%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.1-6
+- Rebuild for new gcc/glibc.
+- Clean up spec file a little (desktop file conditional).
+
 * Sun May 22 2005 Jeremy Katz  - 1.1-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Feb  9 18:47:53 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  9 Feb 2006 13:47:53 -0500
Subject: rpms/jogl/devel jogl.spec,1.13,1.14
Message-ID: <200602091848.k19ImPma020383@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	jogl.spec 
Log Message:
Rebuild with new gcc.



Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jogl.spec	15 Dec 2005 06:54:36 -0000	1.13
+++ jogl.spec	9 Feb 2006 18:47:53 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           jogl
 Version:        1.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Java bindings for the OpenGL API
 
 Group:          System Environment/Libraries
@@ -107,6 +107,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb  9 2006 Anthony Green  - 0:1.1.1-13
+- Rebuild with new 4.1 compiler (post ABI change).
+
 * Sat Dec 14 2005 Anthony Green  - 0:1.1.1-12
 - Build with GCC 4.1.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 18:50:41 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu,  9 Feb 2006 13:50:41 -0500
Subject: rpms/kawa/devel kawa.spec,1.5,1.6
Message-ID: <200602091851.k19IpDwb020450@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	kawa.spec 
Log Message:
Release -5.  Add groff BuildRequires.



Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kawa.spec	9 Feb 2006 18:12:50 -0000	1.5
+++ kawa.spec	9 Feb 2006 18:50:40 -0000	1.6
@@ -5,7 +5,7 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -14,6 +14,7 @@
 BuildPrereq: gcc-java >= 4.1.0
 Requires: libgcj >= 4.1.0
 BuildRequires:    texinfo
+BuildRequires:    groff
 BuildRequires:    readline-devel
 BuildRequires:    ant >= 1.6
 BuildRequires:    servletapi5
@@ -84,6 +85,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb  9 2006 Anthony Green  - 1:1.8-5
+- Add groff build requirement for man page processing.
+
 * Thu Feb  9 2006 Anthony Green  - 1:1.8-4
 - Rebuild with new 4.1 compiler (post ABI change).
 



From fedora-extras-commits at redhat.com  Thu Feb  9 19:00:26 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Thu,  9 Feb 2006 14:00:26 -0500
Subject: rpms/pbzip2 import.log,1.6,1.7
Message-ID: <200602091900.k19J0wlZ020573@cvs-int.fedora.redhat.com>

Author: jeffg

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

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.6-1 on branch FC-4 from pbzip2-0.9.6-1.src.rpm
Bug fix update


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	9 Feb 2006 18:35:25 -0000	1.6
+++ import.log	9 Feb 2006 19:00:26 -0000	1.7
@@ -3,3 +3,4 @@
 pbzip2-0_9_5-1:FC-3:pbzip2-0.9.5-1.src.rpm:1136304021
 pbzip2-0_9_5-1:FC-4:pbzip2-0.9.5-1.src.rpm:1136304536
 pbzip2-0_9_6-1:HEAD:pbzip2-0.9.6-1.src.rpm:1139510121
+pbzip2-0_9_6-1:FC-4:pbzip2-0.9.6-1.src.rpm:1139511622



From fedora-extras-commits at redhat.com  Thu Feb  9 19:00:32 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Thu,  9 Feb 2006 14:00:32 -0500
Subject: rpms/pbzip2/FC-4 .cvsignore, 1.3, 1.4 pbzip2.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200602091901.k19J14Bs020597@cvs-int.fedora.redhat.com>

Author: jeffg

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

Modified Files:
	.cvsignore pbzip2.spec sources 
Log Message:
auto-import pbzip2-0.9.6-1 on branch FC-4 from pbzip2-0.9.6-1.src.rpm
Bug fix update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jan 2006 16:09:28 -0000	1.3
+++ .cvsignore	9 Feb 2006 19:00:32 -0000	1.4
@@ -1 +1 @@
-pbzip2-0.9.5.tar.gz
+pbzip2-0.9.6.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/pbzip2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pbzip2.spec	3 Jan 2006 16:09:28 -0000	1.2
+++ pbzip2.spec	9 Feb 2006 19:00:32 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		pbzip2
-Version:	0.9.5
+Version:	0.9.6
 Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Sun Feb 5 2006 Jeff Gilchrist  - 0.9.6-1
+- Release 0.9.6
+
 * Sat Dec 31 2005 Jeff Gilchrist  - 0.9.5-1
 - Release 0.9.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2006 16:09:28 -0000	1.3
+++ sources	9 Feb 2006 19:00:32 -0000	1.4
@@ -1 +1 @@
-94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz
+851800855b2cf0c84b6169554b562ff2  pbzip2-0.9.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 19:01:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 14:01:41 -0500
Subject: rpms/thttpd/devel thttpd.spec,1.8,1.9
Message-ID: <200602091902.k19J2DK3022443@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	thttpd.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- thttpd.spec	7 Nov 2005 11:41:31 -0000	1.8
+++ thttpd.spec	9 Feb 2006 19:01:40 -0000	1.9
@@ -1,14 +1,13 @@
 %define webroot /var/www/thttpd
-#define prever  beta1
 
 Summary: Tiny, turbo, throttleable lightweight http server
 Name: thttpd
 Version: 2.25b
-Release: %{?prever:0.%{prever}.}8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.acme.com/software/thttpd/
-Source0: http://www.acme.com/software/thttpd/thttpd-%{version}%{?prever}.tar.gz
+Source0: http://www.acme.com/software/thttpd/thttpd-%{version}.tar.gz
 Source1: thttpd.init
 Source2: thttpd.logrotate
 Source10: index.html
@@ -29,7 +28,7 @@
 
 
 %prep
-%setup -n %{name}-%{version}%{?prever}
+%setup
 %patch0 -p1 -b .CVE-2005-3124
 
 
@@ -142,6 +141,10 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  2.25b-9
+- Rebuild for new gcc/glibc.
+- Remove prever stuff, 2.25b final has been around for while now.
+
 * Mon Nov  7 2005 Matthias Saou  2.25b-8
 - Add patch from Gentoo to fix CVE-2005-3124 (#172469, Ville Skytt??).
 - Minor cosmetic spec file changes.



From fedora-extras-commits at redhat.com  Thu Feb  9 19:02:21 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Thu,  9 Feb 2006 14:02:21 -0500
Subject: rpms/pbzip2/FC-3 .cvsignore, 1.3, 1.4 pbzip2.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200602091902.k19J2r4s022500@cvs-int.fedora.redhat.com>

Author: jeffg

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

Modified Files:
	.cvsignore pbzip2.spec sources 
Log Message:
auto-import pbzip2-0.9.6-1 on branch FC-3 from pbzip2-0.9.6-1.src.rpm
Bug fix update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Jan 2006 16:00:38 -0000	1.3
+++ .cvsignore	9 Feb 2006 19:02:21 -0000	1.4
@@ -1 +1 @@
-pbzip2-0.9.5.tar.gz
+pbzip2-0.9.6.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/pbzip2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pbzip2.spec	3 Jan 2006 16:00:38 -0000	1.2
+++ pbzip2.spec	9 Feb 2006 19:02:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		pbzip2
-Version:	0.9.5
+Version:	0.9.6
 Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Sun Feb 5 2006 Jeff Gilchrist  - 0.9.6-1
+- Release 0.9.6
+
 * Sat Dec 31 2005 Jeff Gilchrist  - 0.9.5-1
 - Release 0.9.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2006 16:00:38 -0000	1.3
+++ sources	9 Feb 2006 19:02:21 -0000	1.4
@@ -1 +1 @@
-94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz
+851800855b2cf0c84b6169554b562ff2  pbzip2-0.9.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 19:02:14 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Thu,  9 Feb 2006 14:02:14 -0500
Subject: rpms/pbzip2 import.log,1.7,1.8
Message-ID: <200602091902.k19J2qsJ022494@cvs-int.fedora.redhat.com>

Author: jeffg

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

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.6-1 on branch FC-3 from pbzip2-0.9.6-1.src.rpm
Bug fix update


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	9 Feb 2006 19:00:26 -0000	1.7
+++ import.log	9 Feb 2006 19:02:14 -0000	1.8
@@ -4,3 +4,4 @@
 pbzip2-0_9_5-1:FC-4:pbzip2-0.9.5-1.src.rpm:1136304536
 pbzip2-0_9_6-1:HEAD:pbzip2-0.9.6-1.src.rpm:1139510121
 pbzip2-0_9_6-1:FC-4:pbzip2-0.9.6-1.src.rpm:1139511622
+pbzip2-0_9_6-1:FC-3:pbzip2-0.9.6-1.src.rpm:1139511717



From fedora-extras-commits at redhat.com  Thu Feb  9 19:07:30 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 14:07:30 -0500
Subject: rpms/ucarp/devel ucarp.spec,1.5,1.6
Message-ID: <200602091908.k19J826g022688@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	ucarp.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: ucarp.spec
===================================================================
RCS file: /cvs/extras/rpms/ucarp/devel/ucarp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ucarp.spec	17 Nov 2005 12:40:30 -0000	1.5
+++ ucarp.spec	9 Feb 2006 19:07:30 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
 Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.ucarp.org/
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.1-4
+- Rebuild for new gcc/glibc.
+
 * Thu Nov 17 2005 Matthias Saou  1.1-3
 - Rebuild against new libpcap library.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 19:09:40 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Thu,  9 Feb 2006 14:09:40 -0500
Subject: rpms/sblim-cmpi-devel - New directory
Message-ID: <200602091909.k19J9g5a022856@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22847/sblim-cmpi-devel

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




From fedora-extras-commits at redhat.com  Thu Feb  9 19:09:48 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Thu,  9 Feb 2006 14:09:48 -0500
Subject: rpms/sblim-cmpi-devel/devel - New directory
Message-ID: <200602091909.k19J9oeu022882@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22847/sblim-cmpi-devel/devel

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




From fedora-extras-commits at redhat.com  Thu Feb  9 19:09:46 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 14:09:46 -0500
Subject: rpms/udftools/devel udftools.spec,1.5,1.6
Message-ID: <200602091910.k19JAIxg022941@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	udftools.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: udftools.spec
===================================================================
RCS file: /cvs/extras/rpms/udftools/devel/udftools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- udftools.spec	23 Aug 2005 15:13:11 -0000	1.5
+++ udftools.spec	9 Feb 2006 19:09:46 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Linux UDF Filesystem userspace utilities
 Name: udftools
 Version: 1.0.0b3
-Release: 3
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Archiving
 URL: http://sourceforge.net/projects/linux-udf/
@@ -41,12 +41,16 @@
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING
 %{_bindir}/*
-%{_libdir}/libudffs.a
+%exclude %{_libdir}/libudffs.a
 %exclude %{_libdir}/libudffs.la
 %{_mandir}/man?/*
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  1.0.0b3-4
+- Rebuild for new gcc/glibc.
+- Exclude the static library... there isn't even a header file.
+
 * Tue May  3 2005 Matthias Saou  1.0.0b3-3
 - Include patches to fix big endian issue and gcc4 compile.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 19:10:29 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Thu,  9 Feb 2006 14:10:29 -0500
Subject: rpms/sblim-cmpi-devel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602091910.k19JAVRn022970@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22926/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-devel


--- NEW 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 Feb  9 19:10:17 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Thu,  9 Feb 2006 14:10:17 -0500
Subject: rpms/sblim-cmpi-devel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602091910.k19JAJNu022950@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22926

Added Files:
	Makefile import.log 
Log Message:
Setup of module sblim-cmpi-devel


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb  9 19:11:17 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Thu,  9 Feb 2006 14:11:17 -0500
Subject: rpms/sblim-cmpi-devel import.log,1.1,1.2
Message-ID: <200602091911.k19JBnFd023079@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045

Modified Files:
	import.log 
Log Message:
auto-import sblim-cmpi-devel-1.0.4-1 on branch devel from sblim-cmpi-devel-1.0.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Feb 2006 19:10:17 -0000	1.1
+++ import.log	9 Feb 2006 19:11:16 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-devel-1_0_4-1:HEAD:sblim-cmpi-devel-1.0.4-1.src.rpm:1139512193



From fedora-extras-commits at redhat.com  Thu Feb  9 19:11:39 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Thu,  9 Feb 2006 14:11:39 -0500
Subject: rpms/sblim-cmpi-devel/devel sblim-cmpi-devel.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602091912.k19JCCNF023096@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045/devel

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


--- NEW FILE sblim-cmpi-devel.spec ---
#
# sblim-cmpi-devel.spec
#
# Package spec for cmpi-devel - RedHat/Fedora Flavor
#
# Use this SPEC if building for a RH/Fedora System
# This package is providing the C and C++ headers for CMPI 
# but not the C++ library.
#

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Summary: SBLIM CMPI Provider Development Support
Name: sblim-cmpi-devel
Version: 1.0.4
Release: 1
Group: Systems Management/Base
URL: http://www.sblim.org
License: CPL

Provides: cmpi-devel

Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2

%Description
This packages provides the C and C++ CMPI header files needed by 
provider developers and can be used standalone. If used for 
C++ provider development it is also necessary to have 
tog-pegasus-devel installed.

%prep

%setup -T -b 0 -n %{name}-%{version}

%build

%configure --disable-library
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT 

make DESTDIR=$RPM_BUILD_ROOT install

%clean
rm -rf $RPM_BUILD_ROOT 

%files
%defattr(-,root,root)
%doc %{_datadir}/doc/%{name}-%{version}
%{_includedir}/cmpi

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Thu Feb 09 2006 Viktor Mihajlovski  1.0.4-1
  - Initial RH/Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Feb 2006 19:10:28 -0000	1.1
+++ .cvsignore	9 Feb 2006 19:11:39 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-devel-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Feb 2006 19:10:28 -0000	1.1
+++ sources	9 Feb 2006 19:11:39 -0000	1.2
@@ -0,0 +1 @@
+c8dc0a7871cf9f0ad796e8ef0427292a  sblim-cmpi-devel-1.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Feb  9 19:15:01 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 14:15:01 -0500
Subject: rpms/viruskiller/devel viruskiller.spec,1.6,1.7
Message-ID: <200602091915.k19JFYnk023222@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	viruskiller.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: viruskiller.spec
===================================================================
RCS file: /cvs/extras/rpms/viruskiller/devel/viruskiller.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- viruskiller.spec	30 May 2005 23:15:16 -0000	1.6
+++ viruskiller.spec	9 Feb 2006 19:14:58 -0000	1.7
@@ -1,24 +1,17 @@
-%define desktop_vendor fedora
-
-%{?dist: %{expand: %%define %dist 1}}
-
-%{?el2:%define _without_freedesktop 1}
-%{?rh7:%define _without_freedesktop 1}
-
 Summary: Frantic shooting game where viruses invade your computer
 Name: viruskiller
 Version: 0.9
-Release: 5
+Release: 6%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.parallelrealities.co.uk/virusKiller.php
+# No absolute URL since the home page tunnels it through a PHP script
 Source: viruskiller-%{version}-1.tar.gz
 Patch0: viruskiller-0.9-makefile.patch
 Patch1: viruskiller-0.9-zzip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel
-BuildRequires: zziplib-devel
-%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+BuildRequires: zziplib-devel, desktop-file-utils
 
 %description
 Your computer has been invaded! Dozens of little viruses are pouring in via
@@ -29,9 +22,6 @@
 will just eat them right there on the spot! See how long you and your computer
 can survive the onslaught!
 
-Available rpmbuild rebuild options :
---without : freedesktop
-
 
 %prep
 %setup
@@ -63,16 +53,11 @@
 Encoding=UTF-8
 EOF
 
-%if %{!?_without_freedesktop:1}0
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
-    --vendor %{desktop_vendor} \
+    --vendor fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
-%else
-%{__install} -D -m 0644 %{name}.desktop \
-    %{buildroot}%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
 
 
 %clean
@@ -85,14 +70,14 @@
 %{_prefix}/games/viruskiller
 %{_prefix}/share/games/viruskiller
 %{_datadir}/pixmaps/viruskiller.png
-%if %{!?_without_freedesktop:1}0
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
-%else
-%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
+%{_datadir}/applications/*%{name}.desktop
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  0.9-6
+- Rebuild for new gcc/glibc.
+- Remove old desktop file conditionals.
+
 * Tue May 31 2005 Michael Schwendt  - 0.9-5
 - rebuild once more as 0.9-4 src.rpm failed to build in build system
 



From fedora-extras-commits at redhat.com  Thu Feb  9 19:18:48 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Thu,  9 Feb 2006 14:18:48 -0500
Subject: owners owners.list,1.626,1.627
Message-ID: <200602091919.k19JJKNI023328@cvs-int.fedora.redhat.com>

Author: hamzy

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

Modified Files:
	owners.list 
Log Message:
Added sblim-cmpi-devel



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- owners.list	9 Feb 2006 16:44:09 -0000	1.626
+++ owners.list	9 Feb 2006 19:18:48 -0000	1.627
@@ -1162,6 +1162,7 @@
 Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-cmpi-base|Standards Based Linux Instrumentation Base CMPI Providers for System-related CIM classes|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
+Fedora Extras|sblim-cmpi-devel|provides the C and C++ CMPI header files needed by provider developers|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-testsuite|SBLIM automated testsuite scripts|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|sblim-wbemcli|WBEM Command Line Interface is a standalone, command line WBEM client|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Feb  9 19:20:25 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 14:20:25 -0500
Subject: rpms/xvattr/devel xvattr.spec,1.7,1.8
Message-ID: <200602091920.k19JKv1e023412@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xvattr.spec 
Log Message:
Rebuild for new gcc/glibc and modular X.



Index: xvattr.spec
===================================================================
RCS file: /cvs/extras/rpms/xvattr/devel/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	9 Feb 2006 19:20:25 -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: 8%{?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
+%if "%{?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
@@ -44,6 +46,9 @@
 
 
 %changelog
+* 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  Thu Feb  9 19:20:56 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Thu,  9 Feb 2006 14:20:56 -0500
Subject: rpms/sblim-cmpi-devel/devel sblim-cmpi-devel.spec,1.1,1.2
Message-ID: <200602091921.k19JLTHa023472@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23402

Modified Files:
	sblim-cmpi-devel.spec 
Log Message:
Updated the version



Index: sblim-cmpi-devel.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/devel/sblim-cmpi-devel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sblim-cmpi-devel.spec	9 Feb 2006 19:11:39 -0000	1.1
+++ sblim-cmpi-devel.spec	9 Feb 2006 19:20:56 -0000	1.2
@@ -13,7 +13,7 @@
 Summary: SBLIM CMPI Provider Development Support
 Name: sblim-cmpi-devel
 Version: 1.0.4
-Release: 1
+Release: 1.fc5
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL



From fedora-extras-commits at redhat.com  Thu Feb  9 19:24:42 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 14:24:42 -0500
Subject: rpms/yasm/devel yasm.spec,1.5,1.6
Message-ID: <200602091925.k19JPEk3023607@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	yasm.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: yasm.spec
===================================================================
RCS file: /cvs/extras/rpms/yasm/devel/yasm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- yasm.spec	11 Oct 2005 23:33:39 -0000	1.5
+++ yasm.spec	9 Feb 2006 19:24:42 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Complete rewrite of the NASM assembler
 Name: yasm
 Version: 0.4.0
-Release: 4
+Release: 5%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://www.tortall.net/projects/yasm/
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  0.4.0-5
+- Rebuild for new gcc/glibc.
+
 * Sun May 22 2005 Jeremy Katz  - 0.4.0-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Feb  9 19:27:48 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu,  9 Feb 2006 14:27:48 -0500
Subject: rpms/zziplib/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 zziplib.spec, 1.4, 1.5
Message-ID: <200602091928.k19JSLuL023722@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore sources zziplib.spec 
Log Message:
Update to 0.13.45.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zziplib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Apr 2005 09:04:05 -0000	1.3
+++ .cvsignore	9 Feb 2006 19:27:48 -0000	1.4
@@ -1 +1 @@
-zziplib-0.13.38.tar.bz2
+zziplib-0.13.45.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zziplib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Apr 2005 09:04:05 -0000	1.3
+++ sources	9 Feb 2006 19:27:48 -0000	1.4
@@ -1 +1 @@
-3eccd9b39c057eb49652e90914abfdf5  zziplib-0.13.38.tar.bz2
+687e6e487795680dd1e8ea9c1670e0ab  zziplib-0.13.45.tar.bz2


Index: zziplib.spec
===================================================================
RCS file: /cvs/extras/rpms/zziplib/devel/zziplib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zziplib.spec	22 May 2005 23:13:07 -0000	1.4
+++ zziplib.spec	9 Feb 2006 19:27:48 -0000	1.5
@@ -1,9 +1,7 @@
-# $Id$
-
 Summary: Lightweight library to easily extract data from zip files
 Name: zziplib
-Version: 0.13.38
-Release: 2
+Version: 0.13.45
+Release: 1%{?dist}
 License: LGPL/MPL
 Group: Applications/Archiving
 URL: http://zziplib.sourceforge.net/
@@ -53,11 +51,9 @@
 %{__rm} -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -70,7 +66,7 @@
 %defattr(-, root, root, 0755)
 %doc docs/README.SDL docs/*.htm
 %{_includedir}/*
-%{_libdir}/*.a
+%exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -79,6 +75,10 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou  0.13.45-1
+- Update to 0.13.45.
+- Exclude static library.
+
 * Sun May 22 2005 Jeremy Katz  - 0.13.38-2
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Feb  9 19:29:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Feb 2006 14:29:18 -0500
Subject: fedora-rpmdevtools fedora-extract, 1.1, 1.2 fedora-rpmdevtools.spec,
	1.88, 1.89
Message-ID: <200602091929.k19JTI6A023803@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	fedora-extract fedora-rpmdevtools.spec 
Log Message:
* Thu Feb  9 2006 Ville Skytt?? 
- Add file(1) based archive type detection to fedora-extract.



Index: fedora-extract
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-extract,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-extract	7 Oct 2004 19:05:03 -0000	1.1
+++ fedora-extract	9 Feb 2006 19:29:10 -0000	1.2
@@ -8,11 +8,12 @@
 # License: GPL
 # $Id$
 
-# TODO: *.arc
-# TODO: file(1) archive type detection
+# TODO: more archive types
 
 set -e
 unset CDPATH
+ftype=
+decomp=
 quiet=
 force=
 dir=
@@ -25,80 +26,109 @@
     echo "  -C dir    Change to directory 'dir' before extracting."
 }
 
+fmime()
+{
+    case "$1" in
+        application/x-zip|application/zip)                  ftype=zip  ;;
+        application/x-tar*)                                 ftype=tar  ;;
+        application/x-rpm)                                  ftype=rpm  ;;
+        application/x-archive|application/x-debian-package) ftype=ar   ;;
+        application/x-arj)                                  ftype=arj  ;;
+        application/x-zoo)                                  ftype=zoo  ;;
+        application/x-lha*)                                 ftype=lha  ;;
+        application/x-rar)                                  ftype=rar  ;;
+    esac
+}
+
+ftype()
+{
+    t=`file -ibL "$1" 2>/dev/null`
+    fmime "$t"
+    [ -n "$ftype" ] && return
+
+    case "$t" in
+        application/x-compress|application/x-gzip)  decomp="gzip -dc"  ;;
+        application/x-bzip2)                        decomp="bzip2 -dc" ;;
+    esac
+
+    if [ -n "$decomp" ] ; then
+        t=`file -zibL "$1" 2>/dev/null`
+        fmime "$t"
+        [ -n "$ftype" ] && return
+    fi
+
+    t=`file -${decomp:+z}bL "$1" 2>/dev/null`
+    case "$t" in
+        *Z[iI][pP]\ *archive*)                              ftype=zip  ;;
+        *tar\ archive*)                                     ftype=tar  ;;
+        *ar\ archive*|*Debian\ *package*)                   ftype=ar   ;;
+        *ARJ\ *archive*)                                    ftype=arj  ;;
+        *Zoo\ *archive*)                                    ftype=zoo  ;;
+        *cpio\ archive*)                                    ftype=cpio ;;
+        *C[aA][bB]*archive*)                                ftype=cab  ;;
+        RPM\ *)                                             ftype=rpm  ;;
+        *ACE\ *archive*)                                    ftype=ace  ;;
+        *LHa\ *archive*)                                    ftype=lha  ;;
+        *RAR\ *archive*)                                    ftype=rar  ;;
+    esac
+}
+
 unarch()
 {
     case "$1" in
         /*) f="$1" ;;
-        *) f="$PWD/$1" ;;
+        *)  f="$PWD/$1" ;;
     esac
+    ftype "$1"
     cd "$2"
-    case "$f" in
-        *.tar.bz2|*.tbz)
-            [ -n "$force" ] && o= || o=k
-            tar jxv${o}f "$f"
-            ;;
-        *.tar.gz|*.tgz|*.tar.Z)
+    case "$ftype" in
+        tar)
             [ -n "$force" ] && o= || o=k
-            tar zxv${o}f "$f"
+            ${decomp:-cat} "$f" | tar xv$o
             ;;
-        *.tar)
-            [ -n "$force" ] && o= || o=k
-            tar xv${o}f "$f"
-            ;;
-        *.zip|*.jar|*.ear|*.war)
+        zip)
             [ -n "$force" ] && o=-o || o=-n
             unzip $o "$f"
             ;;
-        *.rar)
-            [ -n "$force" ] && o=-o+ || o=-o-
-            unrar x $o -y "$f"
+        rar)
+            [ -n "$force" ] && o=+ || o=-
+            unrar x -o$o -y "$f"
             ;;
-        *.cab)
-            # force not supported, it's always on (as of cabextract 1.0)
+        cab)
+            # force not supported, it's always on (as of cabextract 1.[01])
             cabextract -f "$f"
             ;;
-        *.rpm)
-            [ -n "$force" ] && o=u || o=
+        rpm)
             name=`rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
             mkdir -p "$name"
             cd "$name"
             rpm2cpio "$f" \
-            | cpio --quiet --no-absolute-filenames -id${o}mv 2>&1 \
+            | cpio --quiet --no-absolute-filenames -id${force:+u}mv 2>&1 \
             | sed "s|^\(\./\)\?|$name/|"
             cd ..
             ;;
-        *.cpio)
-            [ -n "$force" ] && o=u || o=
-            cpio --quiet --no-absolute-filenames -id${o}mv < "$f"
-            ;;
-        *.cpio.gz|*.cpio.Z|*.cgz)
-            [ -n "$force" ] && o=u || o=
-            gzip -dc "$f" | cpio --quiet --no-absolute-filenames -id${o}mv
-            ;;
-        *.cpio.bz2|*.cbz)
-            [ -n "$force" ] && o=u || o=
-            bzip2 -dc "$f" | cpio --quiet --no-absolute-filenames -id${o}mv
+        cpio)
+            ${decomp:-cat} "$f" | \
+                cpio --quiet --no-absolute-filenames -id${force:+u}mv
             ;;
-        *.a|*.deb)
+        ar)
             # force not supported, it's always on
             ar xvo "$f"
             ;;
-        *.ace)
+        ace)
             [ -n "$force" ] && o=+ || o=-
             unace x -o$o -y "$f"
             ;;
-        *.arj)
+        arj)
             # force not supported, it's always off (as of unarj 2.6[35])
             # it will also return an error if some files already exist :(
             unarj x "$f"
             ;;
-        *.zoo)
-            [ -n "$force" ] && o=OOS || o=
-            zoo x$o "$f"
-            ;;
-        *.lhz)
-            [ -n "$force" ] && o=f || o=
-            lha x$o "$f" &2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- fedora-rpmdevtools.spec	8 Feb 2006 18:57:53 -0000	1.88
+++ fedora-rpmdevtools.spec	9 Feb 2006 19:29:10 -0000	1.89
@@ -21,7 +21,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl, wget
+Requires:       rpm-python, python, cpio, sed, perl, wget, file
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Thu Feb  9 2006 Ville Skytt?? 
+- Add file(1) based archive type detection to fedora-extract.
+
 * Wed Feb  8 2006 Ville Skytt?? 
 - Add "diff file lists only" option to diffarchive.
 



From fedora-extras-commits at redhat.com  Thu Feb  9 20:58:50 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  9 Feb 2006 15:58:50 -0500
Subject: rpms/docbook2X - New directory
Message-ID: <200602092058.k19KwqHp025990@cvs-int.fedora.redhat.com>

Author: pertusus

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

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




From fedora-extras-commits at redhat.com  Thu Feb  9 20:58:56 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  9 Feb 2006 15:58:56 -0500
Subject: rpms/docbook2X/devel - New directory
Message-ID: <200602092058.k19KwwcR026005@cvs-int.fedora.redhat.com>

Author: pertusus

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

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




From fedora-extras-commits at redhat.com  Thu Feb  9 20:59:15 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  9 Feb 2006 15:59:15 -0500
Subject: rpms/docbook2X Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602092059.k19KxHno026043@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb  9 20:59:21 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  9 Feb 2006 15:59:21 -0500
Subject: rpms/docbook2X/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602092059.k19KxNrl026067@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


--- NEW 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 Feb  9 21:00:06 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  9 Feb 2006 16:00:06 -0500
Subject: rpms/docbook2X import.log,1.1,1.2
Message-ID: <200602092100.k19L0c5F026170@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	import.log 
Log Message:
auto-import docbook2X-0.8.5-1.fc4 on branch devel from docbook2X-0.8.5-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Feb 2006 20:59:15 -0000	1.1
+++ import.log	9 Feb 2006 21:00:06 -0000	1.2
@@ -0,0 +1 @@
+docbook2X-0_8_5-1_fc4:HEAD:docbook2X-0.8.5-1.fc4.src.rpm:1139518737



From fedora-extras-commits at redhat.com  Thu Feb  9 21:00:12 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  9 Feb 2006 16:00:12 -0500
Subject: rpms/docbook2X/devel docbook2X-vendor_perl.diff, NONE,
	1.1 docbook2X.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602092100.k19L0inh026174@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore sources 
Added Files:
	docbook2X-vendor_perl.diff docbook2X.spec 
Log Message:
auto-import docbook2X-0.8.5-1.fc4 on branch devel from docbook2X-0.8.5-1.fc4.src.rpm

docbook2X-vendor_perl.diff:

--- NEW FILE docbook2X-vendor_perl.diff ---
--- perl/Makefile.in-old	2006-02-03 19:28:27.000000000 +0100
+++ perl/Makefile.in	2006-02-03 19:30:43.000000000 +0100
@@ -286,7 +286,7 @@
 
 install-data-local:
 	if test ! -e XML ; then cp -dpR $(srcdir)/XML . ; fi
-	cd XML/Handler && perl Makefile.PL PREFIX=$(prefix) && $(MAKE) install_perl
+	cd XML/Handler && perl Makefile.PL PREFIX=$(prefix) && $(MAKE) install_vendor
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


--- NEW FILE docbook2X.spec ---
Name:           docbook2X
Version:        0.8.5
Release:        1%{?dist}
Summary:        Convert docbook into man and Texinfo

Group:          Applications/Text
License:        BSD
URL:            http://docbook2x.sourceforge.net/
Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz

# modify Makefile.in to replace make install_perl by make install_vendor
Patch0:         docbook2X-vendor_perl.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxslt openjade
# rpmlint isn't happy with libxslt, but we need xsltproc
Requires:       libxslt openjade texinfo
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
docbook2X converts DocBook documents into man pages and Texinfo
documents.


%prep
%setup -q
%patch

%build
# to avoid clashing with docbook2* from docbook-utils
%configure --program-transform-name='s/docbook2/db2x_docbook2/'
make %{?_smp_mflags}
mkdir html
cp doc/*.html html


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
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 f -name 'perllocal.pod' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'


%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%preun
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%doc COPYING README THANKS AUTHORS html/
%{_bindir}/db2x_manxml
%{_bindir}/db2x_texixml
%{_bindir}/db2x_xsltproc
%{_bindir}/db2x_docbook2man
%{_bindir}/db2x_docbook2texi
%{_bindir}/sgml2xml-isoent
%{_bindir}/utf8trans
%{_datadir}/docbook2X/
%{_mandir}/man1/*
%{_infodir}/docbook2*
%{perl_vendorlib}/*


%changelog
* Fri Feb  3 2006 Patrice Dumas  - 0.8.5-1
- FE submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Feb 2006 20:59:21 -0000	1.1
+++ .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
@@ -0,0 +1 @@
+docbook2X-0.8.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Feb 2006 20:59:21 -0000	1.1
+++ sources	9 Feb 2006 21:00:11 -0000	1.2
@@ -0,0 +1 @@
+05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Feb  9 21:57:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  9 Feb 2006 16:57:32 -0500
Subject: rpms/scorched3d/devel scorched3d-buf.patch, NONE,
	1.1 scorched3d-64bit.patch, 1.3,
	1.4 scorched3d-cvs-20050929.patch, 1.1,
	1.2 scorched3d-help.patch, 1.1, 1.2 scorched3d.spec, 1.9,
	1.10 scorched3d-cvs-20050929-bins.tar.gz, 1.1, NONE
Message-ID: <200602092158.k19Lw4bB028259@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	scorched3d-64bit.patch scorched3d-cvs-20050929.patch 
	scorched3d-help.patch scorched3d.spec 
Added Files:
	scorched3d-buf.patch 
Removed Files:
	scorched3d-cvs-20050929-bins.tar.gz 
Log Message:
more scorched3d WIP

scorched3d-buf.patch:

--- NEW FILE scorched3d-buf.patch ---
diff -ur scorched.orig/src/GLEXT/GLConsole.cpp scorched/src/GLEXT/GLConsole.cpp
--- scorched.orig/src/GLEXT/GLConsole.cpp	2005-04-05 00:35:23.000000000 +0200
+++ scorched/src/GLEXT/GLConsole.cpp	2006-02-09 20:41:01.000000000 +0100
@@ -53,7 +53,7 @@
 
 void GLConsole::logMessage(LoggerInfo &info)
 {
-	addLine(false, info.getMessage());
+	addLine(false, "%s", info.getMessage());
 }
 
 void GLConsole::keyboardCheck(const unsigned state, float frameTime, 
@@ -111,7 +111,7 @@
 								itor != matches.end();
 								itor++)
 							{
-								addLine(false, (*itor)->getName());
+								addLine(false, "%s", (*itor)->getName());
 							}
 						}
 					}
@@ -160,7 +160,7 @@
 			KeyboardKey *key = (*keyItor);
 			if (key->keyDown(buffer, keyState, false))
 			{
-				addLine(true, key->getName());
+				addLine(true, "%s", key->getName());
 			}
 		}
 	}
@@ -265,7 +265,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vnsprintf(text, TEXT_SIZE, fmt, ap);
 	va_end(ap);
 
 	DIALOG_ASSERT(strlen(text)getName(), "command")==0)
 		{
-			GLConsole::instance()->addLine(true, currentNode->getContent());
+			GLConsole::instance()->addLine(true, "%s", currentNode->getContent());
 		}
 	}
 	return true;
Only in scorched/src/GLEXT: GLConsoleFileReader.cpp~
diff -ur scorched.orig/src/GLEXT/GLStateExtension.cpp scorched/src/GLEXT/GLStateExtension.cpp
--- scorched.orig/src/GLEXT/GLStateExtension.cpp	2004-09-09 20:03:49.000000000 +0200
+++ scorched/src/GLEXT/GLStateExtension.cpp	2006-02-09 22:52:09.000000000 +0100
@@ -122,13 +122,13 @@
 // HACK for skin creator
 #ifdef dDOUBLE
 	GLConsole::instance()->addLine(false, "GL_VENDOR:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_VENDOR));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_VENDOR));
 	GLConsole::instance()->addLine(false, "GL_RENDERER:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_RENDERER));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_RENDERER));
 	GLConsole::instance()->addLine(false, "GL_VERSION:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_VERSION));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_VERSION));
 	GLConsole::instance()->addLine(false, "GL_EXTENSIONS:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_EXTENSIONS));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_EXTENSIONS));
 	GLConsole::instance()->addLine(false, "TEXTURE_UNITS:");
 	GLConsole::instance()->addLine(false, "%s (%i units)", ((glActiveTextureARB_==0)?"Off":"On"),textureUnits_);
 	GLConsole::instance()->addLine(false, "VBO:");
Only in scorched/src/GLEXT: GLStateExtension.cpp~
Only in scorched/src: Makefile
diff -ur scorched.orig/src/client/MessageDisplay.cpp scorched/src/client/MessageDisplay.cpp
--- scorched.orig/src/client/MessageDisplay.cpp	2005-08-16 22:23:59.000000000 +0200
+++ scorched/src/client/MessageDisplay.cpp	2006-02-09 22:53:21.000000000 +0100
@@ -62,7 +62,7 @@
 			if (currentText_.size())
 			{
 				GLConsole::instance()->addLine(
-					false, currentText_.c_str());
+					false, "%s", currentText_.c_str());
 			}
 			currentText_ = texts_.front();
 			texts_.pop_front();
diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
--- scorched.orig/src/scorched/MainDialog.cpp	2006-02-09 14:47:28.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-09 20:14:02.000000000 +0100
@@ -131,8 +131,8 @@
 #ifdef __DARWIN__
 	system(formatString("open %s", url));
 #else
-	system(formatString("mozilla %s", url));
-	dialogMessage("Web site location", "%s", url);
+	system(formatString("htmlview %s&", url));
+ 	// dialogMessage("Web site location", "%s", url);
 #endif // __DARWIN__
 #endif // _WIN32
 }
diff -ur scorched.orig/src/sound/Sound.cpp scorched/src/sound/Sound.cpp
--- scorched.orig/src/sound/Sound.cpp	2006-02-09 14:47:28.000000000 +0100
+++ scorched/src/sound/Sound.cpp	2006-02-09 22:54:05.000000000 +0100
@@ -118,19 +118,19 @@
 	alDistanceModel(AL_INVERSE_DISTANCE);
 
 	GLConsole::instance()->addLine(false, "AL_VENDOR:");
-	GLConsole::instance()->addLine(false, 
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_VENDOR)));
 	GLConsole::instance()->addLine(false, "AL_VERSION:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_VERSION)));
 	GLConsole::instance()->addLine(false, "AL_RENDERER:");
-	GLConsole::instance()->addLine(false, 
+	GLConsole::instance()->addLine(false, "%s", 
 		checkString((char *) alGetString(AL_RENDERER)));
 	GLConsole::instance()->addLine(false, "AL_EXTENSIONS:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_EXTENSIONS)));
 	GLConsole::instance()->addLine(false, "ALC_DEVICE_SPECIFIER:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alcGetString(soundDevice, ALC_DEVICE_SPECIFIER)));
 
 	// Create all sound channels
Only in scorched/src/sound: Sound.cpp~
diff -ur scorched.orig/src/tankgraph/TankMenus.cpp scorched/src/tankgraph/TankMenus.cpp
--- scorched.orig/src/tankgraph/TankMenus.cpp	2005-07-19 23:45:37.000000000 +0200
+++ scorched/src/tankgraph/TankMenus.cpp	2006-02-09 22:55:19.000000000 +0100
@@ -193,11 +193,11 @@
 		}
 
 		char buffer[1024];
-		sprintf(buffer, "%c %8s - \"%10s\" (%s)", 
+		snprintf(buffer, 1024, "%c %8s - \"%10s\" (%s)", 
 			currentTank == tank?'>':' ',
 			description,
 			tank->getName(), modelId.getModelName());
-		GLConsole::instance()->addLine(false, buffer);
+		GLConsole::instance()->addLine(false, "%s", buffer);
 	}
 
 	GLConsole::instance()->addLine(false,
Only in scorched/src/tankgraph: TankMenus.cpp~
Only in scorched: tank2.png

scorched3d-64bit.patch:

Index: scorched3d-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-64bit.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scorched3d-64bit.patch	8 Feb 2006 21:42:04 -0000	1.3
+++ scorched3d-64bit.patch	9 Feb 2006 21:57:31 -0000	1.4
@@ -1,6 +1,7 @@
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/GLEXT/GLTexture.cpp scorched/src/GLEXT/GLTexture.cpp
---- scorched.orig/src/GLEXT/GLTexture.cpp	2005-06-05 23:54:01.000000000 +0200
-+++ scorched/src/GLEXT/GLTexture.cpp	2006-02-08 20:35:07.000000000 +0100
+Only in scorched/data/globalmods/apoc/data/accessories/weapons: moab.txt.cvs
+diff -ur scorched.orig/src/GLEXT/GLTexture.cpp scorched/src/GLEXT/GLTexture.cpp
+--- scorched.orig/src/GLEXT/GLTexture.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/GLEXT/GLTexture.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -119,7 +119,7 @@
  		if (height == 1 || width == 1) texType_ = GL_TEXTURE_1D;
  		else texType_ = GL_TEXTURE_2D;
@@ -10,9 +11,9 @@
  		{
  			GLfloat priority = 1.0f;
  			glGenTextures(1, &texNum_);
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/client/ClientConnectionAcceptHandler.cpp scorched/src/client/ClientConnectionAcceptHandler.cpp
---- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp	2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/client/ClientConnectionAcceptHandler.cpp	2006-02-08 21:14:07.000000000 +0100
+diff -ur scorched.orig/src/client/ClientConnectionAcceptHandler.cpp scorched/src/client/ClientConnectionAcceptHandler.cpp
+--- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/client/ClientConnectionAcceptHandler.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -66,7 +66,9 @@
  
  	if (OptionsParam::instance()->getConnectedToServer())
@@ -24,9 +25,9 @@
  		if (!ConnectDialog::instance()->getIdStore().saveUniqueId(
  			ip, message.getUniqueId(), message.getPublishAddress()))
  		{
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
---- scorched.orig/src/client/ServerBrowser.cpp	2003-10-21 18:58:11.000000000 +0200
-+++ scorched/src/client/ServerBrowser.cpp	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
+--- scorched.orig/src/client/ServerBrowser.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/client/ServerBrowser.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -50,7 +50,7 @@
  
  int ServerBrowser::threadFunc(void *var)
@@ -36,9 +37,9 @@
  	bool result = false;
  	if (lan) result = instance_->serverList_.fetchLANList();
  	else result = instance_->serverList_.fetchServerList();
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
---- scorched.orig/src/coms/NetServer.cpp	2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServer.cpp	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
+--- scorched.orig/src/coms/NetServer.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServer.cpp	2006-02-09 16:48:09.000000000 +0100
 @@ -33,6 +33,7 @@
  {
  	sockSet_ = SDLNet_AllocSocketSet(1);
@@ -47,12 +48,13 @@
  	SDL_CreateThread(NetServer::threadFunc, (void *) this);
  }
  
-@@ -66,7 +67,7 @@
+@@ -66,7 +67,8 @@
  		{
  			NetMessage *message = (delayedMessages_.front()).second;
  			delayedMessages_.pop_front();
 -			sendMessage((TCPsocket) message->getDestinationId(), message);
-+			sendMessage(message->getDestinationId(), message);
++			sendMessage(getServerRead(message->getDestinationId()),
++				message);
  		}
  	}
  
@@ -89,32 +91,37 @@
  	}
  	SDL_UnlockMutex(setMutex_);
  	return true;
-@@ -212,13 +211,20 @@
+@@ -212,13 +211,25 @@
  
  void NetServer::addClient(TCPsocket client)
  {
-+	SDL_LockMutex(setMutex_);
-+	// Find a free ID
-+	unsigned int ID = lastId_ + 1;
 +	std::map::iterator itor;
-+	while ((itor = connections_.find(ID)) != connections_.end())
-+		ID++;
-+	lastId_ = ID;
++
++	// Find a free ID
++	SDL_LockMutex(setMutex_);
++	do {
++		lastId_++;
++		/* ID 0 == broadcast so don't use it */
++		if (lastId_ == 0)
++			lastId_++;
++		itor = connections_.find(lastId_);
++	} while (itor != connections_.end());
 +	
  	// Create the thread to read this socket
 -	NetServerRead *serverRead = new NetServerRead(
 -		client, protocol_, &messageHandler_, &checkDeleted_, sentNotification_);
-+	NetServerRead *serverRead = new NetServerRead(client, ID, protocol_,
-+		&messageHandler_, &checkDeleted_, sentNotification_);
++	NetServerRead *serverRead = new NetServerRead(client, lastId_,
++		protocol_, &messageHandler_, &checkDeleted_,
++		sentNotification_);
  
  	// Add this to the collection of sockets (connections)
 -	SDL_LockMutex(setMutex_);
 -	connections_[client] = serverRead;
-+	connections_[ID] = serverRead;
++	connections_[lastId_] = serverRead;
  	firstDestination_ = (*connections_.begin()).first;
  	SDL_UnlockMutex(setMutex_);
  
-@@ -228,27 +234,22 @@
+@@ -228,27 +238,23 @@
  
  void NetServer::disconnectAllClients()
  {
@@ -137,20 +144,21 @@
 -	TCPsocket client = (TCPsocket) dest;
 -	DIALOG_ASSERT(client);
 -
++	NetServerRead *serverRead = getServerRead(dest);
  	NetMessage *message = NetMessagePool::instance()->
  		getFromPool(NetMessage::DisconnectMessage, 
 -				(unsigned int) client,
 -				getIpAddress(client));
-+				dest, getIpAddress(dest));
++				dest, getIpAddress(serverRead));
  
  	if (delayed)
  	{
-@@ -258,25 +259,20 @@
+@@ -258,26 +264,22 @@
  	else
  	{
  		// Add the message to the list of out going
 -		sendMessage(client, message);
-+		sendMessage(dest, message);
++		sendMessage(serverRead, message);
  	}
  }
  
@@ -160,75 +168,92 @@
 +	sendMessage(buffer, firstDestination_);
  }
  
--void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest)
+ void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest)
 -							
-+void NetServer::sendMessage(NetBuffer &buffer, unsigned int destination)
  {
 -	TCPsocket destination = (TCPsocket) dest;
 -	DIALOG_ASSERT(destination);
 -
++	NetServerRead *serverRead = getServerRead(dest);
  	// Get a new buffer from the pool
  	NetMessage *message = NetMessagePool::instance()->
 -		getFromPool(NetMessage::NoMessage, 
 -				(unsigned int) destination,
-+		getFromPool(NetMessage::NoMessage, destination,
- 				getIpAddress(destination));
+-				getIpAddress(destination));
++		getFromPool(NetMessage::NoMessage, dest,
++				getIpAddress(serverRead));
  
  	// Add message to new buffer
-@@ -289,12 +285,12 @@
- 	sendMessage(destination, message);
+ 	message->getBuffer().allocate(buffer.getBufferUsed());
+@@ -286,28 +288,37 @@
+ 	message->getBuffer().setBufferUsed(buffer.getBufferUsed());
+ 
+ 	// Send Mesage
+-	sendMessage(destination, message);
++	sendMessage(serverRead, message);
  }
  
 -void NetServer::sendMessage(TCPsocket client, NetMessage *message)
-+void NetServer::sendMessage(unsigned int dest, NetMessage *message)
++void NetServer::sendMessage(NetServerRead *serverRead, NetMessage *message)
  {
- 	// Find the client
- 	SDL_LockMutex(setMutex_);
+-	// Find the client
+-	SDL_LockMutex(setMutex_);
 -	std::map::iterator itor = 
 -		connections_.find(client);
-+	std::map::iterator itor = 
-+		connections_.find(dest);
- 	if (itor != connections_.end()) 
+-	if (itor != connections_.end()) 
++	if (serverRead)
  	{
  		// Add the message to the list of out going
-@@ -304,10 +300,31 @@
+-		NetServerRead *serverRead = (*itor).second;
+ 		serverRead->addMessage(message);
+ 	}
  	else
- 	{
+-	{
  		NetMessagePool::instance()->addToPool(message);
 -		Logger::log( "Unknown sendMessage destination %i",
 -			(int) client);
-+		Logger::log( "Unknown sendMessage destination %u", dest);
-+	}
-+	SDL_UnlockMutex(setMutex_);
 +}
 +
-+unsigned int NetServer::getIpAddress(unsigned int destination)
++NetServerRead *NetServer::getServerRead(unsigned int dest)
 +{
-+	unsigned int addr = 0;
-+
-+	SDL_LockMutex(setMutex_);
-+	std::map::iterator itor = 
-+		connections_.find(destination);
-+	if (itor != connections_.end())
++	NetServerRead *serverRead = 0;
++	
++	if (dest)
 +	{
-+		NetServerRead *serverRead = (*itor).second;
-+		IPaddress *address = SDLNet_TCP_GetPeerAddress(
-+					serverRead->getSocket());
-+		if (address)
-+		{
-+			addr = SDLNet_Read32(&address->host);
-+		}
++		SDL_LockMutex(setMutex_);
++		std::map::iterator itor = 
++			connections_.find(dest);
++		if (itor != connections_.end())
++			serverRead = (*itor).second;
++		else
++			Logger::log( "Unknown destination %u", dest);
++		SDL_UnlockMutex(setMutex_);
  	}
- 	SDL_UnlockMutex(setMutex_);
-+
-+	return addr;
+-	SDL_UnlockMutex(setMutex_);
++	
++	return serverRead;
  }
  
  unsigned int NetServer::getIpAddress(TCPsocket destination)
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServer.h scorched/src/coms/NetServer.h
---- scorched.orig/src/coms/NetServer.h	2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServer.h	2006-02-08 20:18:31.000000000 +0100
-@@ -47,27 +47,29 @@
+@@ -324,3 +335,14 @@
+ 	return addr;
+ }
+ 
++unsigned int NetServer::getIpAddress(NetServerRead *serverRead)
++{
++	if (serverRead == 0) return 0;
++	
++	return getIpAddress(serverRead->getSocket());
++}
++
++unsigned int NetServer::getIpAddress(unsigned int destination)
++{
++	return getIpAddress(getServerRead(destination));
++}
+diff -ur scorched.orig/src/coms/NetServer.h scorched/src/coms/NetServer.h
+--- scorched.orig/src/coms/NetServer.h	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServer.h	2006-02-09 16:48:14.000000000 +0100
+@@ -47,28 +47,32 @@
  	virtual void sendMessage(NetBuffer &buffer, unsigned int destination);
  	void setSentNotification() { sentNotification_ = true; }
  
@@ -257,13 +282,18 @@
  	bool pollDeleted();
  	void addClient(TCPsocket client);
 -	void sendMessage(TCPsocket client, NetMessage *message);
-+	void sendMessage(unsigned int dest, NetMessage *message);
- 
+-
++	void sendMessage(NetServerRead *serverRead, NetMessage *message);
++	NetServerRead *getServerRead(unsigned int dest);
++	unsigned int getIpAddress(NetServerRead *serverRead);
++	
  private:
  
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
---- scorched.orig/src/coms/NetServerProtocol.cpp	2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/coms/NetServerProtocol.cpp	2006-02-07 20:41:25.000000000 +0100
+ 	NetServer(const NetServer &);
+Only in scorched/src/coms: NetServer.h~
+diff -ur scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
+--- scorched.orig/src/coms/NetServerProtocol.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -40,7 +40,8 @@
  {
  }
@@ -393,9 +423,9 @@
  	netBuffer->getBuffer().reset();
  
  	// get the string buffer over the socket
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerProtocol.h scorched/src/coms/NetServerProtocol.h
---- scorched.orig/src/coms/NetServerProtocol.h	2005-06-08 19:29:38.000000000 +0200
-+++ scorched/src/coms/NetServerProtocol.h	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/coms/NetServerProtocol.h scorched/src/coms/NetServerProtocol.h
+--- scorched.orig/src/coms/NetServerProtocol.h	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.h	2006-02-09 14:47:28.000000000 +0100
 @@ -29,8 +29,10 @@
  	NetServerProtocol();
  	virtual ~NetServerProtocol();
@@ -461,9 +491,9 @@
  };
  
  #endif
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
---- scorched.orig/src/coms/NetServerRead.cpp	2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServerRead.cpp	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
+--- scorched.orig/src/coms/NetServerRead.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServerRead.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -26,11 +26,12 @@
  #include 
  
@@ -549,9 +579,9 @@
  					NetServer::getIpAddress(socket_));
  			messageHandler_->addMessage(notification);
  		}
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/coms/NetServerRead.h scorched/src/coms/NetServerRead.h
---- scorched.orig/src/coms/NetServerRead.h	2005-06-11 01:24:31.000000000 +0200
-+++ scorched/src/coms/NetServerRead.h	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/coms/NetServerRead.h scorched/src/coms/NetServerRead.h
+--- scorched.orig/src/coms/NetServerRead.h	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/coms/NetServerRead.h	2006-02-09 14:47:28.000000000 +0100
 @@ -28,6 +28,7 @@
  {
  public:
@@ -575,9 +605,9 @@
  	SDLNet_SocketSet sockSet_;
  	NetServerProtocol *protocol_;
  	NetMessageHandler *messageHandler_;
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
---- scorched.orig/src/dialogs/HelpButtonDialog.cpp	2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/dialogs/HelpButtonDialog.cpp	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
+--- scorched.orig/src/dialogs/HelpButtonDialog.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/dialogs/HelpButtonDialog.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -160,7 +160,7 @@
  
  void HelpButtonDialog::itemSelected(GLWSelectorEntry *entry, int position)
@@ -587,9 +617,9 @@
  	if (data != -1)
  	{
  		int volume = int(float(data) * 12.8f);
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
---- scorched.orig/src/engine/ScorchedCollisionHandler.cpp	2005-06-08 19:29:38.000000000 +0200
-+++ scorched/src/engine/ScorchedCollisionHandler.cpp	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
+--- scorched.orig/src/engine/ScorchedCollisionHandler.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/engine/ScorchedCollisionHandler.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -93,7 +93,7 @@
  	}
  
@@ -608,9 +638,9 @@
  	ShotProjectile *shot = (ShotProjectile *) particleInfo->data;
  	shot->incLandedCounter();
  	Vector particlePositionV(
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/ode/config.h scorched/src/ode/config.h
---- scorched.orig/src/ode/config.h	2004-11-02 10:20:35.000000000 +0100
-+++ scorched/src/ode/config.h	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/ode/config.h scorched/src/ode/config.h
+--- scorched.orig/src/ode/config.h	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/ode/config.h	2006-02-09 14:47:28.000000000 +0100
 @@ -81,7 +81,7 @@
  /* an integer type that we can safely cast a pointer to and from without
   * loss of bits.
@@ -620,9 +650,9 @@
  
  
  /* if we're compiling on a pentium, we may need to know the clock rate so
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
---- scorched.orig/src/scorched/SettingsDialog.cpp	2006-02-06 22:37:12.000000000 +0100
-+++ scorched/src/scorched/SettingsDialog.cpp	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
+--- scorched.orig/src/scorched/SettingsDialog.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/scorched/SettingsDialog.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -748,44 +748,44 @@
  
  	// Env
@@ -691,9 +721,9 @@
  			SettingsMain::IDC_TEAMBALLANCE_CTRL->GetClientData(
  				SettingsMain::IDC_TEAMBALLANCE_CTRL->GetSelection()));			
  		context_.setTeams((int) SettingsMain::IDC_TEAMS_CTRL->GetSelection() + 1);
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/server/ServerConnectHandler.cpp scorched/src/server/ServerConnectHandler.cpp
---- scorched.orig/src/server/ServerConnectHandler.cpp	2005-07-24 21:34:01.000000000 +0200
-+++ scorched/src/server/ServerConnectHandler.cpp	2006-02-08 20:17:33.000000000 +0100
+diff -ur scorched.orig/src/server/ServerConnectHandler.cpp scorched/src/server/ServerConnectHandler.cpp
+--- scorched.orig/src/server/ServerConnectHandler.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/server/ServerConnectHandler.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -87,7 +87,9 @@
  		}
  
@@ -705,9 +735,9 @@
  	}
  
  	// Decode the connect message
-diff -ur --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
---- scorched.orig/src/tankgraph/GLWTankTip.cpp	2005-06-11 18:53:41.000000000 +0200
-+++ scorched/src/tankgraph/GLWTankTip.cpp	2006-02-07 20:41:25.000000000 +0100
+diff -ur scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
+--- scorched.orig/src/tankgraph/GLWTankTip.cpp	2006-02-09 14:52:14.000000000 +0100
++++ scorched/src/tankgraph/GLWTankTip.cpp	2006-02-09 14:47:28.000000000 +0100
 @@ -66,7 +66,7 @@
  
  void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position)

scorched3d-cvs-20050929.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 scorched3d-cvs-20050929.patch
Index: scorched3d-cvs-20050929.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-cvs-20050929.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-cvs-20050929.patch	5 Feb 2006 21:58:44 -0000	1.1
+++ scorched3d-cvs-20050929.patch	9 Feb 2006 21:57:31 -0000	1.2
@@ -1,913 +1,3 @@
-diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/Makefile.am scorched-cvs/Makefile.am
---- scorched/Makefile.am	2005-08-30 20:04:22.000000000 +0200
-+++ scorched-cvs/Makefile.am	2005-09-22 17:14:27.000000000 +0200
-@@ -71,13 +71,8 @@
- 	data/keys.xml \
- 	data/landscapes.xml \
- 	data/landscapesdefn.xml \
--	data/landscapesplace.xml \
--	data/landscapessound.xml \
- 	data/landscapestex.xml \
- 	data/mysql.xml \
--	data/pgprunetables.sql \
--	data/pgsql.xml \
--	data/pgstatstables.sql \
- 	data/playernames.txt \
- 	data/prunetables.sql \
- 	data/random.no \
-@@ -96,7 +91,12 @@
- 	data/tanks.xml \
- 	data/textureset.xml \
- 	data/tips.txt \
--	data/windows.xml
-+	data/windows.xml \
-+	data/pgprunetables.sql \
-+	data/pgsql.xml \
-+	data/pgstatstables.sql \
-+	data/landscapesplace.xml \
-+	data/landscapessound.xml
- scorcheddataaccessoriesdir = ${datadir}/data/accessories
- scorcheddataaccessories_DATA = data/accessories/clusterbomb.ase \
- 	data/accessories/clusterbomb2.ase \
-@@ -114,9 +114,6 @@
- 	data/accessories/barrage/gradient.bmp \
- 	data/accessories/barrage/white.bmp \
- 	data/accessories/barrage/yellow.bmp
--scorcheddataaccessoriesbeer_bottledir = ${datadir}/data/accessories/beer_bottle
--scorcheddataaccessoriesbeer_bottle_DATA = data/accessories/beer_bottle/bottle.bmp \
--	data/accessories/beer_bottle/bottle.txt
- scorcheddataaccessoriesbombdir = ${datadir}/data/accessories/bomb
- scorcheddataaccessoriesbomb_DATA = data/accessories/bomb/black.bmp \
- 	data/accessories/bomb/bomb.txt \
-@@ -142,23 +139,12 @@
- 	data/accessories/hawkmissile/hawk.txt \
- 	data/accessories/hawkmissile/white.bmp \
- 	data/accessories/hawkmissile/yellow.bmp
--scorcheddataaccessoriesherringdir = ${datadir}/data/accessories/herring
--scorcheddataaccessoriesherring_DATA = data/accessories/herring/body.bmp \
--	data/accessories/herring/eyes.bmp \
--	data/accessories/herring/herring.txt
- scorcheddataaccessoriesicbmdir = ${datadir}/data/accessories/icbm
- scorcheddataaccessoriesicbm_DATA = data/accessories/icbm/black.bmp \
- 	data/accessories/icbm/gradient.bmp \
- 	data/accessories/icbm/icbm.txt \
- 	data/accessories/icbm/white.bmp \
- 	data/accessories/icbm/yellow.bmp
--scorcheddataaccessorieslaserdir = ${datadir}/data/accessories/laser
--scorcheddataaccessorieslaser_DATA = data/accessories/laser/about.txt \
--	data/accessories/laser/alpha2.bmp \
--	data/accessories/laser/blue128.bmp \
--	data/accessories/laser/hlaser.txt \
--	data/accessories/laser/laser.txt \
--	data/accessories/laser/red128.bmp
- scorcheddataaccessorieslittleboydir = ${datadir}/data/accessories/littleboy
- scorcheddataaccessorieslittleboy_DATA = data/accessories/littleboy/black.bmp \
- 	data/accessories/littleboy/littleboy.txt
-@@ -215,6 +201,26 @@
- 	data/accessories/smallpine/wintersmallpine.txt \
- 	data/accessories/smallpine/wintersmallpine2.txt \
- 	data/accessories/smallpine/wintersmallpine3.txt
-+scorcheddataaccessoriesv2missiledir = ${datadir}/data/accessories/v2missile
-+scorcheddataaccessoriesv2missile_DATA = data/accessories/v2missile/black.bmp \
-+	data/accessories/v2missile/checker.bmp \
-+	data/accessories/v2missile/gradient.bmp \
-+	data/accessories/v2missile/v2missile.txt \
-+	data/accessories/v2missile/yellow.bmp
-+scorcheddataaccessoriesherringdir = ${datadir}/data/accessories/herring
-+scorcheddataaccessoriesherring_DATA = data/accessories/herring/body.bmp \
-+	data/accessories/herring/eyes.bmp \
-+	data/accessories/herring/herring.txt
-+scorcheddataaccessoriesbeer_bottledir = ${datadir}/data/accessories/beer_bottle
-+scorcheddataaccessoriesbeer_bottle_DATA = data/accessories/beer_bottle/bottle.bmp \
-+	data/accessories/beer_bottle/bottle.txt
-+scorcheddataaccessorieslaserdir = ${datadir}/data/accessories/laser
-+scorcheddataaccessorieslaser_DATA = data/accessories/laser/about.txt \
-+	data/accessories/laser/alpha2.bmp \
-+	data/accessories/laser/blue128.bmp \
-+	data/accessories/laser/hlaser.txt \
-+	data/accessories/laser/laser.txt \
-+	data/accessories/laser/red128.bmp
- scorcheddataaccessoriessonicringdir = ${datadir}/data/accessories/sonicring
- scorcheddataaccessoriessonicring_DATA = data/accessories/sonicring/sonicring.bmp \
- 	data/accessories/sonicring/sonicring.txt
-@@ -222,38 +228,12 @@
- scorcheddataaccessoriesteleport_DATA = data/accessories/teleport/base.bmp \
- 	data/accessories/teleport/detail.bmp \
- 	data/accessories/teleport/teleport.txt
--scorcheddataaccessoriesv2missiledir = ${datadir}/data/accessories/v2missile
--scorcheddataaccessoriesv2missile_DATA = data/accessories/v2missile/black.bmp \
--	data/accessories/v2missile/checker.bmp \
--	data/accessories/v2missile/gradient.bmp \
--	data/accessories/v2missile/v2missile.txt \
--	data/accessories/v2missile/yellow.bmp
- scorcheddataacessoriesdir = ${datadir}/data/acessories
- scorcheddataacessories_DATA = 
--scorcheddataavatarsdir = ${datadir}/data/avatars
--scorcheddataavatars_DATA = data/avatars/agreement.txt \
--	data/avatars/animal.gif \
--	data/avatars/baby.gif \
--	data/avatars/bavia.gif \
--	data/avatars/computer.gif \
--	data/avatars/daisy.gif \
--	data/avatars/fish.gif \
--	data/avatars/flower.gif \
--	data/avatars/floyd.gif \
--	data/avatars/heart.gif \
--	data/avatars/lips.gif \
--	data/avatars/mxpx.gif \
--	data/avatars/pint.gif \
--	data/avatars/player.gif \
--	data/avatars/prot.gif \
--	data/avatars/termin.gif \
--	data/avatars/vader.gif \
--	data/avatars/web.gif \
--	data/avatars/yoda.gif
- scorcheddatafontsdir = ${datadir}/data/fonts
--scorcheddatafonts_DATA = data/fonts/test.ttf \
--	data/fonts/testout.ttf \
--	data/fonts/veramobd.ttf
-+scorcheddatafonts_DATA = data/fonts/veramobd.ttf \
-+	data/fonts/test.ttf \
-+	data/fonts/testout.ttf
- scorcheddataglobalmodsdir = ${datadir}/data/globalmods
- scorcheddataglobalmods_DATA = data/globalmods/globalmods.txt
- scorcheddataglobalmodsapocdir = ${datadir}/data/globalmods/apoc
-@@ -266,8 +246,6 @@
- 	data/globalmods/apoc/data/ainames.txt \
- 	data/globalmods/apoc/data/landscapes.xml \
- 	data/globalmods/apoc/data/landscapesdefn.xml \
--	data/globalmods/apoc/data/landscapesplace.xml \
--	data/globalmods/apoc/data/landscapessound.xml \
- 	data/globalmods/apoc/data/landscapestex.xml \
- 	data/globalmods/apoc/data/server.xml \
- 	data/globalmods/apoc/data/singleeasy.xml \
-@@ -276,17 +254,71 @@
- 	data/globalmods/apoc/data/singlenormal.xml \
- 	data/globalmods/apoc/data/singletarget.xml \
- 	data/globalmods/apoc/data/tankais.xml \
--	data/globalmods/apoc/data/textureset.xml
-+	data/globalmods/apoc/data/textureset.xml \
-+	data/globalmods/apoc/data/landscapesplace.xml \
-+	data/globalmods/apoc/data/landscapessound.xml
- scorcheddataglobalmodsapocdataaccessoriesdir = ${datadir}/data/globalmods/apoc/data/accessories
- scorcheddataglobalmodsapocdataaccessories_DATA = data/globalmods/apoc/data/accessories/black.bmp \
- 	data/globalmods/apoc/data/accessories/green.bmp \
- 	data/globalmods/apoc/data/accessories/molten.bmp
--scorcheddataglobalmodsapocdataaccessories50caldir = ${datadir}/data/globalmods/apoc/data/accessories/50cal
--scorcheddataglobalmodsapocdataaccessories50cal_DATA = 
- scorcheddataglobalmodsapocdataaccessoriesbouldersdir = ${datadir}/data/globalmods/apoc/data/accessories/boulders
- scorcheddataglobalmodsapocdataaccessoriesboulders_DATA = 
- scorcheddataglobalmodsapocdataaccessoriesbrownbouldersdir = ${datadir}/data/globalmods/apoc/data/accessories/brownboulders
- scorcheddataglobalmodsapocdataaccessoriesbrownboulders_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriescactusdir = ${datadir}/data/globalmods/apoc/data/accessories/cactus
-+scorcheddataglobalmodsapocdataaccessoriescactus_DATA = 
-+scorcheddataglobalmodsapocdataaccessorieschurch1dir = ${datadir}/data/globalmods/apoc/data/accessories/church1
-+scorcheddataglobalmodsapocdataaccessorieschurch1_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriescityofficedir = ${datadir}/data/globalmods/apoc/data/accessories/cityoffice
-+scorcheddataglobalmodsapocdataaccessoriescityoffice_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesdeerdir = ${datadir}/data/globalmods/apoc/data/accessories/deer
-+scorcheddataglobalmodsapocdataaccessoriesdeer_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesfactory1dir = ${datadir}/data/globalmods/apoc/data/accessories/factory1
-+scorcheddataglobalmodsapocdataaccessoriesfactory1_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesfarm1dir = ${datadir}/data/globalmods/apoc/data/accessories/farm1
-+scorcheddataglobalmodsapocdataaccessoriesfarm1_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesfusionbarreldir = ${datadir}/data/globalmods/apoc/data/accessories/fusionbarrel
-+scorcheddataglobalmodsapocdataaccessoriesfusionbarrel_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesgrenadedir = ${datadir}/data/globalmods/apoc/data/accessories/grenade
-+scorcheddataglobalmodsapocdataaccessoriesgrenade_DATA = 
-+scorcheddataglobalmodsapocdataaccessorieshouse1dir = ${datadir}/data/globalmods/apoc/data/accessories/house1
-+scorcheddataglobalmodsapocdataaccessorieshouse1_DATA = 
-+scorcheddataglobalmodsapocdataaccessorieslogcabin1dir = ${datadir}/data/globalmods/apoc/data/accessories/logcabin1
-+scorcheddataglobalmodsapocdataaccessorieslogcabin1_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesm7a3grenadedir = ${datadir}/data/globalmods/apoc/data/accessories/m7a3grenade
-+scorcheddataglobalmodsapocdataaccessoriesm7a3grenade_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesnapalmdir = ${datadir}/data/globalmods/apoc/data/accessories/napalm
-+scorcheddataglobalmodsapocdataaccessoriesnapalm_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesofficeplaza1dir = ${datadir}/data/globalmods/apoc/data/accessories/officeplaza1
-+scorcheddataglobalmodsapocdataaccessoriesofficeplaza1_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesredhornetdir = ${datadir}/data/globalmods/apoc/data/accessories/redhornet
-+scorcheddataglobalmodsapocdataaccessoriesredhornet_DATA = 
-+scorcheddataglobalmodsapocdataaccessoriesremorcebombletdir = ${datadir}/data/globalmods/apoc/data/accessories/remorcebomblet
-+scorcheddataglobalmodsapocdataaccessoriesremorcebomblet_DATA = 
[...2222 lines suppressed...]
--									data/wav/shoot/laser1.wav
--								
--							
--						
-+		
-+			false
-+			true
-+			0
-+			180
-+			
-+				50
-+				
-+					false
-+					true
-+					0
-+					0
-+					
-+						1.25
-+						
-+							
-+								2
-+								200
-+								200
-+								40
-+								40
-+								5
-+								
-+									1.0
-+									0.0
-+									0.0
-+								
-+							
-+							
-+								data/wav/shoot/laser1.wav
-+							
-+							
-+								0
-+								down
-+								3
-+								data/textures/landscape/defaultscorched.bmp
-+								1.0
-+								cloud00
-+								none
-+							
-+							
-+								false
-+								4.0
-+								5.0
-+								1
-+								1.0
-+								0.25
-+								1
-+								5
-+								flames
-+								none
-+							
-+						
- 					
- 				
--			
--			
--				0
--				down
--				3
--				data/textures/landscape/defaultscorched.bmp
--				1.0
--				cloud00
--				none
--			
--			
--				false
--				4.0
--				5.0
--				1
--				1.0
--				0.25
--				1
--				5
--				flames
--				none
--			
-+			
- 		
- 	
- 	
- 		SatDigLaser
--		10
-+		2
- 		0
- 		
- 			1
-@@ -7936,7 +8081,7 @@
- 	
- 	
- 		SatFunkLaser
--		10
-+		2
- 		0
- 		
- 			1
-@@ -7961,7 +8106,7 @@
- 	
- 	
- 		SatTransLaser
--		10
-+		2
- 		0
- 		
- 			1
-@@ -7984,14 +8129,14 @@
- 	
- 	
- 		SatSegment
--		10
-+		2
- 		0
- 		
- 			
- 				SatDigLaser
- 			
- 			
--				SatFunkLaser
-+				SatTransLaser
- 			
- 			
- 				0.33
-@@ -8008,7 +8153,7 @@
- 			
- 				0.66
- 				
--					SatDigLaser
-+					SatTransLaser
- 				
- 			
- 			
-@@ -8025,7 +8170,7 @@
- 		Fires a projectile which hits the ground, marking
- the target area.  Space based laser cannons then assault
- all targets in the area.
--		hlaser.bmp
-+		satellite.bmp
- 		shoot/flare.wav
- 		1
- 		20000
-diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/data/globalmods/apoc/data/tankais.xml scorched-cvs/data/globalmods/apoc/data/tankais.xml
---- scorched/data/globalmods/apoc/data/tankais.xml	2005-07-26 16:08:29.000000000 +0200
-+++ scorched-cvs/data/globalmods/apoc/data/tankais.xml	2005-08-31 05:04:36.000000000 +0200
-@@ -92,7 +92,7 @@
- 			Battery20defense
- 			Shield20defense
- 			Auto Defense30defense
--			Mega EMP30explosionlarge
-+			EMP Missile30explosionlarge
- 			Chain Lightning30explosionlarge
- 			Baby Missile1explosionsmall
- 		
-Binary files scorched/data/globalmods/apoc/data/textures/explode/smoke-orange.bmp and scorched-cvs/data/globalmods/apoc/data/textures/explode/smoke-orange.bmp differ
-Binary files scorched/data/globalmods/apoc/data/textures/wicons/satellite.bmp and scorched-cvs/data/globalmods/apoc/data/textures/wicons/satellite.bmp differ
-Binary files scorched/data/globalmods/apoc/data/wav/shoot/launch.wav and scorched-cvs/data/globalmods/apoc/data/wav/shoot/launch.wav differ
-diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/data/globalmods/apoc/readme.txt scorched-cvs/data/globalmods/apoc/readme.txt
---- scorched/data/globalmods/apoc/readme.txt	2005-08-30 02:52:31.000000000 +0200
-+++ scorched-cvs/data/globalmods/apoc/readme.txt	2005-09-12 00:35:27.000000000 +0200
-@@ -1,5 +1,5 @@
- ----------------------------------------------------
--             Apocalypse v3.1 Information
-+             Apocalypse v3.2 Information
- ----------------------------------------------------
- Apocalypse is a modification for Scorched 3D which adds many new weapons, items, and landscapes
- for use with this awesome game.  The mod is the product of work by several people (named in authors.txt).
-@@ -15,11 +15,16 @@
- 		- Satellite Strike - projectile marks target, then satellite based lasers assault the area
- 			
- 	Other Accessory Changes:
--		- New Projectile Model for Mega Mirv/S-Mirv by Shockwave
-+		- New projectile model for Mega Mirv/S-Mirv by Shockwave
-+		- New projectile model for MOAB by Bobirov
-+		- New missile launch sound that replaces default
- 		- Increased EMP effectiveness against shields slightly and reduced damage to tank
-+		- Turned Mega EMP into a missile weapon instead of grenade, renamed to EMP Missile.
- 		- Decreased cost of Riot Drill, Wall of Dirt and Ring of Dirt slightly
--		- Removed Disco Bunny
-+		- Adjusted sparking effect in Shockwave
- 		- Other updates to projectile models/texturing
-+		- Changed roller model to the newer roller model (finally)
-+		- Removed Disco Bunny
- 			
- 	Landscapes:
- 		- Changes to cities:
-@@ -115,7 +120,7 @@
- Riot Drill      - 3 heavy riot bombs are shot in rapid succession at the same point
- Sat. Strike     - Shoots a projectile which paints the target area.  Space based lasers then assault the target.
- Shockwave       - Creates a massive energy wave which ripples outwards without destroying the landscape
--Strangelove     - The end game weapon
-+Strangelove     - The end game weapon, scaled up dmsday device
- Suicide Bomb    - Detonates yourself causing a huge, powerful explosion
- The Travolta    - Super-sized Funky Bomb
- Wall of Dirt    - Raises a small wall of dirt a short distance from your tank in the direction you aim
 diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/3dsparse/MSModelFactory.cpp scorched-cvs/src/3dsparse/MSModelFactory.cpp
 --- scorched/src/3dsparse/MSModelFactory.cpp	2005-04-12 00:19:08.000000000 +0200
 +++ scorched-cvs/src/3dsparse/MSModelFactory.cpp	2005-09-22 17:14:27.000000000 +0200

scorched3d-help.patch:

Index: scorched3d-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-help.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-help.patch	6 Feb 2006 15:01:40 -0000	1.1
+++ scorched3d-help.patch	9 Feb 2006 21:57:31 -0000	1.2
@@ -1,11 +1,31 @@
 --- scorched/src/scorched/MainDialog.cpp.help	2006-02-06 12:24:58.000000000 +0100
 +++ scorched/src/scorched/MainDialog.cpp	2006-02-06 12:25:42.000000000 +0100
-@@ -131,7 +131,7 @@
+@@ -131,8 +131,8 @@
  #ifdef __DARWIN__
  	system(formatString("open %s", url));
  #else
 -	system(formatString("mozilla %s", url));
+-	dialogMessage("Web site location", "%s", url);
 +	system(formatString("htmlview %s&", url));
- 	dialogMessage("Web site location", "%s", url);
++ 	// dialogMessage("Web site location", "%s", url);
  #endif // __DARWIN__
  #endif // _WIN32
+ }
+--- scorched/src/scorched/HtmlHelpDialog.cpp.help	2006-02-09 19:14:11.000000000 +0100
++++ scorched/src/scorched/HtmlHelpDialog.cpp	2006-02-09 19:14:49.000000000 +0100
+@@ -137,13 +137,13 @@
+ void HelpFrame::onHome(wxCommandEvent &event)
+ {
+ 	html_->HistoryClear();
+-	html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8));
++	html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8));
+ }
+ 
+ void showHtmlHelpDialog()
+ {
+ 	// For the moment just show the documentation in the default web browser
+-	showURL(getDocFile("documentation/html/index.html"));
++	showURL(getDocFile("html/index.html"));
+ 
+ 	//HelpFrame *frame = new HelpFrame();
+ 	//frame->Show();


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scorched3d.spec	7 Feb 2006 21:07:38 -0000	1.9
+++ scorched3d.spec	9 Feb 2006 21:57:31 -0000	1.10
@@ -8,7 +8,6 @@
 URL:            http://www.scorched3d.co.uk/
 Source0:        http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Source2:        %{name}-cvs-20050929-bins.tar.gz
 Patch0:         %{name}-cvs-20050929.patch
 Patch1:         %{name}-syslibs.patch
 Patch2:         %{name}-aclocal18.patch
@@ -57,8 +56,7 @@
 %patch3 -p1 -z .gcc41
 %patch4 -p1 -z .64bit
 %patch5 -p1 -z .openal
-#%patch6 -p1 -z .help
-tar xvfz %{SOURCE2}
+%patch6 -p1 -z .help
 . autogen.sh
 
 
@@ -84,7 +82,7 @@
 install -Dpm 644 tank2.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png
 
-mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version} __docs
+mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs
 
 
 %clean
@@ -100,7 +98,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO __docs/documentation/
+%doc AUTHORS COPYING TODO __docs/
 %{_bindir}/scorched3d
 %{_datadir}/games/scorched3d/
 %{_datadir}/applications/*scorched3d.desktop
@@ -108,14 +106,15 @@
 
 
 %changelog
-* Mon Feb  6 2006  39.1-2
-- upgrade to CVS snapshot of 20050929, as Debian does, this fixes a few
-  internetplay bugs and allows compilation with wxGTK 2.6
+* Thu Feb  9 2006  - 39.1-2
+- upgrade to CVS snapshot of 20050929, as Debian does, but not to
+  the newer apoc version as this causes problems playing online
 - fix gcc41 compilation
-- fix 64 bit compilation (courtesy debian-ppc-64)
+- fix 64 bit compilation (bz 158646)
 - fix compile with openal-0.9
 - use htmlview for helpfile viewing instead of hardcoded mozilla,
   run this in background so the game doesn't freeze
+- this release also fixes bz 161694, 173187
 
 * Sat Oct  8 2005 Ville Skytt??  - 39.1-1
 - 39.1.


--- scorched3d-cvs-20050929-bins.tar.gz DELETED ---



From fedora-extras-commits at redhat.com  Thu Feb  9 22:22:42 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu,  9 Feb 2006 17:22:42 -0500
Subject: rpms/naim/devel .cvsignore, 1.4, 1.5 naim.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <200602092223.k19MNErx030310@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore naim.spec sources 
Log Message:
* Thu Feb  9 2006 Luke Macken  0.11.8.2-1
- 0.11.8.2-2006-01-29-1935 snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2005 19:25:55 -0000	1.4
+++ .cvsignore	9 Feb 2006 22:22:42 -0000	1.5
@@ -1 +1 @@
-naim-0.11.8.1.tar.bz2
+naim-0.11.8.2-2006-01-29-1935.tar.bz2


Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- naim.spec	27 Dec 2005 17:28:23 -0000	1.6
+++ naim.spec	9 Feb 2006 22:22:42 -0000	1.7
@@ -1,12 +1,14 @@
+%define snapshot 2006-01-29-1935
+
 Name: naim
-Version: 0.11.8.1
-Release: 2%{?dist}
+Version: 0.11.8.2
+Release: 1%{?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}.tar.bz2
+Source0: http://shell.n.ml.org/n/%{name}/%{name}-%{version}-%{snapshot}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ncurses-devel
@@ -16,7 +18,7 @@
 Internet Relay Chat (IRC), and The lily CMC.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{snapshot}
 
 %build
 %configure
@@ -38,6 +40,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Feb  9 2006 Luke Macken  0.11.8.2-1
+- 0.11.8.2-2006-01-29-1935 snapshot
+
 * Tue Dec 27 2005 Luke Macken  0.11.8.1-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2005 19:25:55 -0000	1.4
+++ sources	9 Feb 2006 22:22:42 -0000	1.5
@@ -1 +1 @@
-beb0a3b2bcb45cfe9b84075dced494b8  naim-0.11.8.1.tar.bz2
+e03200205b6ffaff8baa790b0b22a7bc  naim-0.11.8.2-2006-01-29-1935.tar.bz2



From fedora-extras-commits at redhat.com  Fri Feb 10 03:30:50 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu,  9 Feb 2006 22:30:50 -0500
Subject: fedora-security/audit fc4,1.149,1.150 fc5,1.58,1.59
Message-ID: <200602100330.k1A3Uo9T008900@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	fc4 fc5 
Log Message:
Note the oprofile issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- fc4	8 Feb 2006 20:52:53 -0000	1.149
+++ fc4	10 Feb 2006 03:30:42 -0000	1.150
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-0591 VULNERABLE (postgresql)
+CVE-2006-0576 VULNERABLE (oprofile)
 CVE-2006-0528 **evolution
 CVE-2006-0496 VULNERABLE (mozilla)
 CVE-2006-0496 VULNERABLE (firefox)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- fc5	8 Feb 2006 20:52:53 -0000	1.58
+++ fc5	10 Feb 2006 03:30:42 -0000	1.59
@@ -16,6 +16,7 @@
 ** are items that need attention
 
 CVE-2006-0591 VULNERABLE (postgresql)
+CVE-2006-0576 VULNERABLE (oprofile)
 CVE-2006-0528 ** evolution [under investigation]
 CVE-2006-0496 VULNERABLE (mozilla) not fixed upstream
 CVE-2006-0496 VULNERABLE (firefox) not fixed upstream



From fedora-extras-commits at redhat.com  Fri Feb 10 04:37:03 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu,  9 Feb 2006 23:37:03 -0500
Subject: rpms/nagios/devel nagios.spec,1.6,1.7
Message-ID: <200602100437.k1A4bZIn010832@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Log Message:
Fixed issue when nagios recieves a SIGHUP and it not being able to read the private directory. 



Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nagios.spec	7 Feb 2006 02:59:23 -0000	1.6
+++ nagios.spec	10 Feb 2006 04:37:02 -0000	1.7
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.3.rc2%{?dist}
+Release: 0.4.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -143,8 +143,8 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*cfg-sample
 
-%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private
-%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
+%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private
+%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
 %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives
@@ -154,6 +154,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Tue Feb 09 2006 Mike McGrath  2.0-0.4.rc2
+- Made /private/* group owner Nagios.  This fixes SIGHUP config read issue.
+
 * Mon Feb 06 2006 Mike McGrath  2.0-0.3.rc2
 - Added proper basic Auth to Apache config for non SSL users
 



From fedora-extras-commits at redhat.com  Fri Feb 10 04:42:12 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu,  9 Feb 2006 23:42:12 -0500
Subject: rpms/nagios/FC-3 nagios.spec,1.4,1.5
Message-ID: <200602100442.k1A4giXu010910@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Log Message:
Fixes issue where nagios could not read the private directory when getting a SIGHUP.



Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/nagios.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nagios.spec	7 Feb 2006 03:25:44 -0000	1.4
+++ nagios.spec	10 Feb 2006 04:42:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.4.rc2%{?dist}
+Release: 0.5.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -143,8 +143,8 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*cfg-sample
 
-%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private
-%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
+%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private
+%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
 %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives
@@ -154,6 +154,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Tue Feb 09 2006 Mike McGrath  2.0-0.5.rc2
+- Made /private/* group owner Nagios.  This fixes SIGHUP config read issue.
+
 * Mon Feb 06 2006 Mike McGrath  2.0-0.4.rc2
 - Added proper basic Auth to Apache config for non SSL users
 



From fedora-extras-commits at redhat.com  Fri Feb 10 04:42:18 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu,  9 Feb 2006 23:42:18 -0500
Subject: rpms/nagios/FC-4 nagios.spec,1.6,1.7
Message-ID: <200602100442.k1A4godD010913@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Log Message:
Fixes issue where nagios could not read the private directory when getting a SIGHUP.



Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nagios.spec	7 Feb 2006 02:59:17 -0000	1.6
+++ nagios.spec	10 Feb 2006 04:42:18 -0000	1.7
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.3.rc2%{?dist}
+Release: 0.4.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -143,8 +143,8 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*cfg-sample
 
-%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private
-%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
+%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private
+%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
 %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives
@@ -154,6 +154,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Tue Feb 09 2006 Mike McGrath  2.0-0.4.rc2
+- Made /private/* group owner Nagios.  This fixes SIGHUP config read issue.
+
 * Mon Feb 06 2006 Mike McGrath  2.0-0.3.rc2
 - Added proper basic Auth to Apache config for non SSL users
 



From fedora-extras-commits at redhat.com  Fri Feb 10 06:45:53 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Fri, 10 Feb 2006 01:45:53 -0500
Subject: rpms/buoh/devel buoh.spec,1.5,1.6
Message-ID: <200602100646.k1A6kPHf014759@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	buoh.spec 
Log Message:
rebuild bump


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buoh.spec	28 Dec 2005 23:49:21 -0000	1.5
+++ buoh.spec	10 Feb 2006 06:45:52 -0000	1.6
@@ -2,7 +2,7 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.1
-Release:          5
+Release:          6
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
 Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
+* Thu feb 10 2006 - Chris Chabot  - 0.8.1-6
+- Rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 28 2005 - Chris Chabot  - 0.8.1-5
 - And changed %files entry too
 



From fedora-extras-commits at redhat.com  Fri Feb 10 06:47:22 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Fri, 10 Feb 2006 01:47:22 -0500
Subject: rpms/buoh/devel buoh.spec,1.6,1.7
Message-ID: <200602100647.k1A6lsLa014789@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	buoh.spec 
Log Message:
Should drink more coffee in morning :)


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buoh.spec	10 Feb 2006 06:45:52 -0000	1.6
+++ buoh.spec	10 Feb 2006 06:47:22 -0000	1.7
@@ -76,7 +76,7 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
-* Thu feb 10 2006 - Chris Chabot  - 0.8.1-6
+* Fri feb 10 2006 - Chris Chabot  - 0.8.1-6
 - Rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Dec 28 2005 - Chris Chabot  - 0.8.1-5



From fedora-extras-commits at redhat.com  Fri Feb 10 06:48:27 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Fri, 10 Feb 2006 01:48:27 -0500
Subject: rpms/buoh/devel buoh.spec,1.7,1.8
Message-ID: <200602100649.k1A6n0xq014816@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	buoh.spec 
Log Message:



Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buoh.spec	10 Feb 2006 06:47:22 -0000	1.7
+++ buoh.spec	10 Feb 2006 06:48:27 -0000	1.8
@@ -76,7 +76,7 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
-* Fri feb 10 2006 - Chris Chabot  - 0.8.1-6
+* Fri Feb 10 2006 - Chris Chabot  - 0.8.1-6
 - Rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Dec 28 2005 - Chris Chabot  - 0.8.1-5



From fedora-extras-commits at redhat.com  Fri Feb 10 06:50:00 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Fri, 10 Feb 2006 01:50:00 -0500
Subject: rpms/libtorrent/devel libtorrent.spec,1.1,1.2
Message-ID: <200602100650.k1A6oWx8014875@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	libtorrent.spec 
Log Message:
Bumped for rebuild


Index: libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtorrent.spec	14 Jan 2006 19:15:11 -0000	1.1
+++ libtorrent.spec	10 Feb 2006 06:49:59 -0000	1.2
@@ -2,7 +2,7 @@
 License:       GPL
 Group:         System Environment/Libraries
 Version:       0.8.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 - Chris Chabot  - 0.8.2-3                                                               
+- Rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 14 2006 - Chris Chabot  - 0.8.2-2
 - Improved general summary & devel package description 
 - Simplified devel package includedir files section



From fedora-extras-commits at redhat.com  Fri Feb 10 06:50:46 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Fri, 10 Feb 2006 01:50:46 -0500
Subject: rpms/rtorrent/devel rtorrent.spec,1.2,1.3
Message-ID: <200602100651.k1A6pIfO014940@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	rtorrent.spec 
Log Message:
Bumped for rebuild


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rtorrent.spec	14 Jan 2006 21:42:00 -0000	1.2
+++ rtorrent.spec	10 Feb 2006 06:50:46 -0000	1.3
@@ -2,7 +2,7 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.4.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -39,6 +39,9 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Fri Feb 10 2006 - Chris Chabot  - 0.4.2-4
+- Rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 14 2006 - Chris Chabot  - 0.4.2-3
 - Added ncurses-devel to buildrequirements
 



From fedora-extras-commits at redhat.com  Fri Feb 10 08:58:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 10 Feb 2006 03:58:46 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.15, 1.16 rxvt-unicode.spec,
	1.17, 1.18 sources, 1.15, 1.16
Message-ID: <200602100859.k1A8xIt0019306@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19251/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	31 Jan 2006 21:48:54 -0000	1.15
+++ .cvsignore	10 Feb 2006 08:58:45 -0000	1.16
@@ -1 +1 @@
-rxvt-unicode-7.5.tar.bz2
+rxvt-unicode-7.6.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rxvt-unicode.spec	31 Jan 2006 21:48:54 -0000	1.17
+++ rxvt-unicode.spec	10 Feb 2006 08:58:45 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.5
+Version:        7.6
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Feb 10 2006 Andreas Bierfert 
+7.6-1
+- version upgrade
+
 * Tue Jan 31 2006 Andreas Bierfert 
 7.5-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 Jan 2006 21:48:54 -0000	1.15
+++ sources	10 Feb 2006 08:58:45 -0000	1.16
@@ -1 +1 @@
-41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2
+37d471287da22af3cab426938ba198cf  rxvt-unicode-7.6.tar.bz2



From fedora-extras-commits at redhat.com  Fri Feb 10 08:58:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 10 Feb 2006 03:58:52 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.15, 1.16 rxvt-unicode.spec,
	1.17, 1.18 sources, 1.15, 1.16
Message-ID: <200602100859.k1A8xPbR019311@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19251/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	31 Jan 2006 21:49:00 -0000	1.15
+++ .cvsignore	10 Feb 2006 08:58:52 -0000	1.16
@@ -1 +1 @@
-rxvt-unicode-7.5.tar.bz2
+rxvt-unicode-7.6.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rxvt-unicode.spec	31 Jan 2006 21:49:00 -0000	1.17
+++ rxvt-unicode.spec	10 Feb 2006 08:58:52 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.5
+Version:        7.6
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Feb 10 2006 Andreas Bierfert 
+7.6-1
+- version upgrade
+
 * Tue Jan 31 2006 Andreas Bierfert 
 7.5-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 Jan 2006 21:49:00 -0000	1.15
+++ sources	10 Feb 2006 08:58:52 -0000	1.16
@@ -1 +1 @@
-41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2
+37d471287da22af3cab426938ba198cf  rxvt-unicode-7.6.tar.bz2



From fedora-extras-commits at redhat.com  Fri Feb 10 08:58:58 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 10 Feb 2006 03:58:58 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.15, 1.16 rxvt-unicode.spec,
	1.21, 1.22 sources, 1.15, 1.16
Message-ID: <200602100859.k1A8xUsE019316@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19251/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	31 Jan 2006 21:49:06 -0000	1.15
+++ .cvsignore	10 Feb 2006 08:58:58 -0000	1.16
@@ -1 +1 @@
-rxvt-unicode-7.5.tar.bz2
+rxvt-unicode-7.6.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rxvt-unicode.spec	31 Jan 2006 21:49:06 -0000	1.21
+++ rxvt-unicode.spec	10 Feb 2006 08:58:58 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.5
+Version:        7.6
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Feb 10 2006 Andreas Bierfert 
+7.6-1
+- version upgrade
+
 * Tue Jan 31 2006 Andreas Bierfert 
 7.5-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 Jan 2006 21:49:06 -0000	1.15
+++ sources	10 Feb 2006 08:58:58 -0000	1.16
@@ -1 +1 @@
-41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2
+37d471287da22af3cab426938ba198cf  rxvt-unicode-7.6.tar.bz2



From fedora-extras-commits at redhat.com  Fri Feb 10 11:10:43 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 10 Feb 2006 06:10:43 -0500
Subject: rpms/perl-Mail-Mbox-MessageParser/devel
	perl-Mail-Mbox-MessageParser.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200602101111.k1ABBHaR025776@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25755

Modified Files:
	perl-Mail-Mbox-MessageParser.spec sources .cvsignore 
Log Message:
- Update to 1.4002
- Don't use macros in build-time command paths, hardcode them instead
- Add dependency on /usr/bin/diff
- Tzip support removed upstream



Index: perl-Mail-Mbox-MessageParser.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/devel/perl-Mail-Mbox-MessageParser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Mail-Mbox-MessageParser.spec	12 Oct 2005 15:22:46 -0000	1.1
+++ perl-Mail-Mbox-MessageParser.spec	10 Feb 2006 11:10:25 -0000	1.2
@@ -1,6 +1,6 @@
 Summary:	A fast and simple mbox folder reader
 Name:		perl-Mail-Mbox-MessageParser
-Version:	1.4001
+Version:	1.4002
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Libraries
@@ -8,7 +8,7 @@
 Source0:	http://dl.sf.net/m-m-msgparser/Mail-Mbox-MessageParser-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-Requires:	grep, gzip, bzip2
+Requires:	grep, gzip, bzip2, /usr/bin/diff
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	perl(FileHandle::Unget)
 
@@ -24,14 +24,12 @@
 %{__chmod} -x lib/Mail/Mbox/MessageParser/*.pm
 
 %build
-# tzip support is broken and will be removed in a forthcoming release anyway
 %{__perl} Makefile.PL INSTALLDIRS=vendor \
-	DIFF=%{_bindir}/diff \
+	DIFF=/usr/bin/diff \
 	BZIP=%{__bzip2} \
 	BZIP2=%{__bzip2} \
 	GREP=%{__grep} \
 	GZIP=%{__gzip} \
-	TZIP= \
 	--default
 %{__make} %{?_smp_mflags}
 
@@ -41,8 +39,8 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
-%{_bindir}/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find %{buildroot} -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -55,5 +53,11 @@
 %{_mandir}/man3/Mail::Mbox::MessageParser*
 
 %changelog
+* Fri Feb 10 2006 Paul Howarth  1.4002-1
+- Update to 1.4002
+- Don't use macros in build-time command paths, hardcode them instead
+- Add dependency on /usr/bin/diff
+- Tzip support removed upstream
+
 * Wed Oct 12 2005 Paul Howarth  1.4001-1
 - Fedora Extras submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Oct 2005 15:22:46 -0000	1.2
+++ sources	10 Feb 2006 11:10:25 -0000	1.3
@@ -1 +1 @@
-eee4ea89dd6d9117296f33d0723987ab  Mail-Mbox-MessageParser-1.4001.tar.gz
+7b0df634e4f60a5d0c1f34ce93535038  Mail-Mbox-MessageParser-1.4002.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Oct 2005 15:22:46 -0000	1.2
+++ .cvsignore	10 Feb 2006 11:10:25 -0000	1.3
@@ -1 +1 @@
-Mail-Mbox-MessageParser-1.4001.tar.gz
+Mail-Mbox-MessageParser-1.4002.tar.gz



From fedora-extras-commits at redhat.com  Fri Feb 10 11:14:27 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 10 Feb 2006 06:14:27 -0500
Subject: rpms/perl-Mail-Mbox-MessageParser/FC-4
	perl-Mail-Mbox-MessageParser.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200602101114.k1ABExk5025861@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25838

Modified Files:
	perl-Mail-Mbox-MessageParser.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-Mail-Mbox-MessageParser.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/FC-4/perl-Mail-Mbox-MessageParser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Mail-Mbox-MessageParser.spec	12 Oct 2005 15:22:46 -0000	1.1
+++ perl-Mail-Mbox-MessageParser.spec	10 Feb 2006 11:14:27 -0000	1.2
@@ -1,6 +1,6 @@
 Summary:	A fast and simple mbox folder reader
 Name:		perl-Mail-Mbox-MessageParser
-Version:	1.4001
+Version:	1.4002
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Libraries
@@ -8,7 +8,7 @@
 Source0:	http://dl.sf.net/m-m-msgparser/Mail-Mbox-MessageParser-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-Requires:	grep, gzip, bzip2
+Requires:	grep, gzip, bzip2, /usr/bin/diff
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	perl(FileHandle::Unget)
 
@@ -24,14 +24,12 @@
 %{__chmod} -x lib/Mail/Mbox/MessageParser/*.pm
 
 %build
-# tzip support is broken and will be removed in a forthcoming release anyway
 %{__perl} Makefile.PL INSTALLDIRS=vendor \
-	DIFF=%{_bindir}/diff \
+	DIFF=/usr/bin/diff \
 	BZIP=%{__bzip2} \
 	BZIP2=%{__bzip2} \
 	GREP=%{__grep} \
 	GZIP=%{__gzip} \
-	TZIP= \
 	--default
 %{__make} %{?_smp_mflags}
 
@@ -41,8 +39,8 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
-%{_bindir}/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find %{buildroot} -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -55,5 +53,11 @@
 %{_mandir}/man3/Mail::Mbox::MessageParser*
 
 %changelog
+* Fri Feb 10 2006 Paul Howarth  1.4002-1
+- Update to 1.4002
+- Don't use macros in build-time command paths, hardcode them instead
+- Add dependency on /usr/bin/diff
+- Tzip support removed upstream
+
 * Wed Oct 12 2005 Paul Howarth  1.4001-1
 - Fedora Extras submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Oct 2005 15:22:46 -0000	1.2
+++ sources	10 Feb 2006 11:14:27 -0000	1.3
@@ -1 +1 @@
-eee4ea89dd6d9117296f33d0723987ab  Mail-Mbox-MessageParser-1.4001.tar.gz
+7b0df634e4f60a5d0c1f34ce93535038  Mail-Mbox-MessageParser-1.4002.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Oct 2005 15:22:46 -0000	1.2
+++ .cvsignore	10 Feb 2006 11:14:27 -0000	1.3
@@ -1 +1 @@
-Mail-Mbox-MessageParser-1.4001.tar.gz
+Mail-Mbox-MessageParser-1.4002.tar.gz



From fedora-extras-commits at redhat.com  Fri Feb 10 11:17:06 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri, 10 Feb 2006 06:17:06 -0500
Subject: rpms/perl-Mail-Mbox-MessageParser/FC-3
	perl-Mail-Mbox-MessageParser.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200602101117.k1ABHc5Z025971@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25947

Modified Files:
	perl-Mail-Mbox-MessageParser.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-Mail-Mbox-MessageParser.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/FC-3/perl-Mail-Mbox-MessageParser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Mail-Mbox-MessageParser.spec	12 Oct 2005 15:22:46 -0000	1.1
+++ perl-Mail-Mbox-MessageParser.spec	10 Feb 2006 11:17:06 -0000	1.2
@@ -1,6 +1,6 @@
 Summary:	A fast and simple mbox folder reader
 Name:		perl-Mail-Mbox-MessageParser
-Version:	1.4001
+Version:	1.4002
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Libraries
@@ -8,7 +8,7 @@
 Source0:	http://dl.sf.net/m-m-msgparser/Mail-Mbox-MessageParser-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-Requires:	grep, gzip, bzip2
+Requires:	grep, gzip, bzip2, /usr/bin/diff
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	perl(FileHandle::Unget)
 
@@ -24,14 +24,12 @@
 %{__chmod} -x lib/Mail/Mbox/MessageParser/*.pm
 
 %build
-# tzip support is broken and will be removed in a forthcoming release anyway
 %{__perl} Makefile.PL INSTALLDIRS=vendor \
-	DIFF=%{_bindir}/diff \
+	DIFF=/usr/bin/diff \
 	BZIP=%{__bzip2} \
 	BZIP2=%{__bzip2} \
 	GREP=%{__grep} \
 	GZIP=%{__gzip} \
-	TZIP= \
 	--default
 %{__make} %{?_smp_mflags}
 
@@ -41,8 +39,8 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
-%{_bindir}/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find %{buildroot} -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
 %{__chmod} -R u+w %{buildroot}/*
 
 %clean
@@ -55,5 +53,11 @@
 %{_mandir}/man3/Mail::Mbox::MessageParser*
 
 %changelog
+* Fri Feb 10 2006 Paul Howarth  1.4002-1
+- Update to 1.4002
+- Don't use macros in build-time command paths, hardcode them instead
+- Add dependency on /usr/bin/diff
+- Tzip support removed upstream
+
 * Wed Oct 12 2005 Paul Howarth  1.4001-1
 - Fedora Extras submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Oct 2005 15:22:46 -0000	1.2
+++ sources	10 Feb 2006 11:17:06 -0000	1.3
@@ -1 +1 @@
-eee4ea89dd6d9117296f33d0723987ab  Mail-Mbox-MessageParser-1.4001.tar.gz
+7b0df634e4f60a5d0c1f34ce93535038  Mail-Mbox-MessageParser-1.4002.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-Mbox-MessageParser/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Oct 2005 15:22:46 -0000	1.2
+++ .cvsignore	10 Feb 2006 11:17:06 -0000	1.3
@@ -1 +1 @@
-Mail-Mbox-MessageParser-1.4001.tar.gz
+Mail-Mbox-MessageParser-1.4002.tar.gz



From fedora-extras-commits at redhat.com  Fri Feb 10 13:00:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:00:14 -0500
Subject: rpms/gc/devel gc.spec,1.14,1.15
Message-ID: <200602101300.k1AD0kXS028092@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gc.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter  6.6-4.1
- fc5: gcc/glibc respin



Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gc.spec	1 Dec 2005 15:10:35 -0000	1.14
+++ gc.spec	10 Feb 2006 13:00:14 -0000	1.15
@@ -3,7 +3,7 @@
 Name:    gc	
 Version: 6.6
 
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter  6.6-4.1
+- fc5: gcc/glibc respin
+
 * Thu Dec 01 2005 Rex Dieter  6.6-4
 - Provides: libgc(-devel)
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:03:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:03:16 -0500
Subject: rpms/akode/devel akode.spec,1.1,1.2
Message-ID: <200602101303.k1AD3nXl029937@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	akode.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter  
- fc5: gcc/glibc respin



Index: akode.spec
===================================================================
RCS file: /cvs/extras/rpms/akode/devel/akode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akode.spec	6 Jan 2006 14:50:17 -0000	1.1
+++ akode.spec	10 Feb 2006 13:03:16 -0000	1.2
@@ -2,7 +2,7 @@
 Summary: Audio-decoding framework 
 Name:	 akode 
 Version: 2.0 
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: LGPL
 Group: 	 System Environment/Libraries
 URL:	 http://carewolf.com/akode/  
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter  
+- fc5: gcc/glibc respin
+
 * Mon Dec 19 2005 Rex Dieter  2.0-1
 - 2.0(final)
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:05:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:05:16 -0500
Subject: rpms/uw-imap/devel uw-imap.spec,1.6,1.7
Message-ID: <200602101305.k1AD5mJI029963@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29943

Modified Files:
	uw-imap.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter  
- fc5: gcc/glibc respin



Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- uw-imap.spec	17 Nov 2005 13:59:25 -0000	1.6
+++ uw-imap.spec	10 Feb 2006 13:05:16 -0000	1.7
@@ -6,7 +6,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2004g
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 
 License: University of Washington Free-Fork License
 Group: 	 System Environment/Daemons
@@ -271,6 +271,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter  
+- fc5: gcc/glibc respin
+
 * Thu Nov 17 2005 Rex Dieter  2004g-4
 - use pam's "include" feature on fc5
 - cleanup %%doc handling, remove useless bits



From fedora-extras-commits at redhat.com  Fri Feb 10 13:07:28 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:07:28 -0500
Subject: rpms/xforms/devel xforms.spec,1.15,1.16
Message-ID: <200602101308.k1AD850A030024@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	xforms.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter  
- fc5: gcc/glibc respin



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xforms.spec	20 Jan 2006 16:05:50 -0000	1.15
+++ xforms.spec	10 Feb 2006 13:07:28 -0000	1.16
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 
 License: LGPL
 Group:   System Environment/Libraries
@@ -95,6 +95,9 @@
 
 
 %changelog 
+* Fri Feb 10 2006 Rex Dieter  
+- fc5: gcc/glibc respin
+
 * Fri Jan 20 2006 Rex Dieter  1.0.90-6
 - -devel: Req: libjpeg-devel(flimage), libXpm-devel
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:15:57 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:15:57 -0500
Subject: rpms/gc/devel gc-6.6-gcc41.patch,NONE,1.1 gc.spec,1.15,1.16
Message-ID: <200602101316.k1ADGUxq030141@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gc.spec 
Added Files:
	gc-6.6-gcc41.patch 
Log Message:
* Fri Feb 10 2006 Rex Dieter  6.6-5
- gcc(4.1) patch 


gc-6.6-gcc41.patch:

--- NEW FILE gc-6.6-gcc41.patch ---
--- gc6.6/include/gc_cpp.h.gcc41	2004-10-21 17:47:45.000000000 -0500
+++ gc6.6/include/gc_cpp.h	2006-02-10 07:12:07.000000000 -0600
@@ -180,7 +180,7 @@
     inline void* operator new[]( size_t size, void *p );
     inline void operator delete[]( void* obj );
 #   ifdef GC_PLACEMENT_DELETE
-      inline void gc::operator delete[]( void*, void* );
+      inline void operator delete[]( void*, void* );
 #   endif
 #endif /* GC_OPERATOR_NEW_ARRAY */
     };    


Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gc.spec	10 Feb 2006 13:00:14 -0000	1.15
+++ gc.spec	10 Feb 2006 13:15:41 -0000	1.16
@@ -3,7 +3,7 @@
 Name:    gc	
 Version: 6.6
 
-Release: 4%{?dist}.1
+Release: 5%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
@@ -12,6 +12,9 @@
 
 # force no undefined symbols (#166344)
 Patch1: gc-6.6-no-undefined.patch
+# gcc(4.1) patch
+Patch2: gc-6.6-gcc41.patch
+
 BuildRequires: libtool
 BuildRequires: automake 
 
@@ -35,6 +38,7 @@
 %setup -q -n %{name}%{version}
 
 %patch1 -p1 -b .no-undefined
+%patch2 -p1 -b .gcc41
 
 cp -f %{_datadir}/aclocal/libtool.m4 .
 libtoolize --copy --force
@@ -97,8 +101,8 @@
 
 
 %changelog
-* Fri Feb 10 2006 Rex Dieter  6.6-4.1
-- fc5: gcc/glibc respin
+* Fri Feb 10 2006 Rex Dieter  6.6-5
+- gcc(4.1) patch 
 
 * Thu Dec 01 2005 Rex Dieter  6.6-4
 - Provides: libgc(-devel)



From fedora-extras-commits at redhat.com  Fri Feb 10 13:18:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:18:06 -0500
Subject: rpms/tidy/devel tidy.spec,1.14,1.15
Message-ID: <200602101318.k1ADIdFi030202@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	tidy.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: tidy.spec
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tidy.spec	20 Jan 2006 18:29:55 -0000	1.14
+++ tidy.spec	10 Feb 2006 13:18:06 -0000	1.15
@@ -4,7 +4,7 @@
 Name:    tidy
 Summary: Utility to clean up and pretty print HTML/XHTML/XML
 Version: 0.99.0
-Release: 9.20051025%{?dist}
+Release: 9.20051025%{?dist}.1
 
 Group:   Applications/Text
 License: W3C Software License
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Fri Jan 20 2006 Rex Dieter  0.99.0-9.20051025
 - libtidy returns to be multilib friendly
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:20:21 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:20:21 -0500
Subject: rpms/sbcl/devel sbcl.spec,1.34,1.35
Message-ID: <200602101320.k1ADKsuf030263@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin
- disable verbose build options



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sbcl.spec	26 Jan 2006 19:52:39 -0000	1.34
+++ sbcl.spec	10 Feb 2006 13:20:21 -0000	1.35
@@ -5,15 +5,15 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-%define sbcl_verbose 1 
+#define sbcl_verbose 1 
 
 # shell to use
-%define sbcl_shell /bin/bash -x
+#define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.9
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -226,6 +226,10 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+- disable verbose build options
+
 * Thu Jan 26 2006 Rex Dieter  0.9.9-1
 - 0.9.9
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:24:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:24:58 -0500
Subject: rpms/pinentry/devel pinentry.spec,1.8,1.9
Message-ID: <200602101325.k1ADPU9S030329@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	pinentry.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: pinentry.spec
===================================================================
RCS file: /cvs/extras/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pinentry.spec	18 Oct 2005 18:18:13 -0000	1.8
+++ pinentry.spec	10 Feb 2006 13:24:58 -0000	1.9
@@ -1,24 +1,28 @@
-Name:           pinentry
-Version:        0.7.2
-Release:        1%{?dist}
-Summary:        Collection of simple PIN or passphrase entry dialogs
-
-Group:          Applications/System
-License:        GPL
-URL:            http://www.gnupg.org/aegypten/
-Source0:        http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
-Source1:        http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig
-Patch0:         %{name}-info.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Name:    pinentry
+Version: 0.7.2
+Release: 1%{?dist}.1
+Summary: Collection of simple PIN or passphrase entry dialogs
+
+Group:   Applications/System
+License: GPL
+URL:     http://www.gnupg.org/aegypten/
+Source0: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
+Source1: http://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: pinentry-info.patch
 
 BuildRequires:  gtk2-devel
 BuildRequires:  qt-devel
 BuildRequires:  ncurses-devel
+
 Requires(post): %{_sbindir}/update-alternatives
 Requires(post): /sbin/install-info
 Requires(postun): %{_sbindir}/update-alternatives
 Requires(postun): /sbin/install-info
-Provides:       %{name}-curses = %{version}-%{release}
+
+Provides: %{name}-curses = %{version}-%{release}
 
 %description
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
@@ -26,29 +30,27 @@
 http://www.gnupg.org/aegypten/ for details.
 This package contains the curses (text) based version of the PIN entry dialog.
 
-%package        gtk
-Summary:        Passphrase/PIN entry dialog based on GTK+
-Group:          Applications/System
-Requires:       %{name} = %{version}-%{release}
+%package gtk
+Summary: Passphrase/PIN entry dialog based on GTK+
+Group:   Applications/System
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-gui = %{version}-%{release}
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
-Provides:       %{name}-gui = %{version}-%{release}
-
-%description    gtk
+%description gtk
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
 utilize the Assuan protocol as described by the aegypten project; see
 http://www.gnupg.org/aegypten/ for details.
 This package contains the GTK+ GUI based version of the PIN entry dialog.
 
-%package        qt
-Summary:        Passphrase/PIN entry dialog based on Qt
-Group:          Applications/System
-Requires:       %{name} = %{version}-%{release}
+%package qt
+Summary: Passphrase/PIN entry dialog based on Qt
+Group:   Applications/System
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-gui = %{version}-%{release}
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
-Provides:       %{name}-gui = %{version}-%{release}
-
-%description    qt
+%description qt
 Pinentry is a collection of simple PIN or passphrase entry dialogs which
 utilize the Assuan protocol as described by the aegypten project; see
 http://www.gnupg.org/aegypten/ for details.
@@ -57,22 +59,34 @@
 
 %prep
 %setup -q
+
 %patch0 -p1
 
 
 %build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-rpath --disable-dependency-tracking --disable-pinentry-gtk
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
+
+%configure \
+  --disable-rpath \
+  --disable-dependency-tracking \
+  --disable-pinentry-gtk
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
+
 # Backwards compatibility
 ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
+
 # Dummy symlink for %%ghost
 ln -sf %{_sysconfdir}/alternatives/pinentry $RPM_BUILD_ROOT%{_bindir}/pinentry
+
+# unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
@@ -81,7 +95,7 @@
 
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/pinentry.info %{_infodir}/dir || :
 if [ $1 -eq 1 ] ; then
   %{_sbindir}/update-alternatives --install %{_bindir}/pinentry \
     pinentry %{_bindir}/pinentry-curses 10
@@ -101,8 +115,7 @@
 
 %postun
 if [ $1 -eq 0 ] ; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info \
-    %{_infodir}/dir 2>/dev/null || :
+  /sbin/install-info --delete %{_infodir}/pinentry.info %{_infodir}/dir || :
   %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses
 fi
 
@@ -136,6 +149,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Tue Oct 18 2005 Ville Skytt??  - 0.7.2-1
 - 0.7.2, docs patch applied upstream.
 - Switch to GTK2 in -gtk.



From fedora-extras-commits at redhat.com  Fri Feb 10 13:30:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:30:19 -0500
Subject: rpms/openslp/devel openslp.spec,1.11,1.12
Message-ID: <200602101330.k1ADUpFY030391@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	openslp.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openslp.spec	19 Dec 2005 18:06:51 -0000	1.11
+++ openslp.spec	10 Feb 2006 13:30:19 -0000	1.12
@@ -2,7 +2,7 @@
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 
 Group:   System Environment/Libraries
 License: BSD
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Mon Dec 19 2005 Rex Dieter  1.2.1-4
 - make %%postun safer
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:31:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:31:36 -0500
Subject: rpms/libtunepimp/devel libtunepimp.spec,1.4,1.5
Message-ID: <200602101332.k1ADW9Zf030453@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	libtunepimp.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libtunepimp.spec	19 Dec 2005 21:36:23 -0000	1.4
+++ libtunepimp.spec	10 Feb 2006 13:31:36 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp 
 Version: 0.4.0 
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 # README.LGPL implies that it's not completely lgpl, yet.
 License: GPL
 Group: 	 System Environment/Libraries
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Mon Dec 19 2005 Rex Dieter  0.4.0-5
 - update gcc4 patch
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:33:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:33:04 -0500
Subject: rpms/libsigsegv/devel libsigsegv.spec,1.7,1.8
Message-ID: <200602101333.k1ADXael030514@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	libsigsegv.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsigsegv.spec	6 Oct 2005 18:24:53 -0000	1.7
+++ libsigsegv.spec	10 Feb 2006 13:33:04 -0000	1.8
@@ -1,9 +1,8 @@
-# $Id$
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
@@ -77,6 +76,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Oct 06 2005 Rex Dieter  - 2.2-1
 - 2.2
 - omit .la file(s)



From fedora-extras-commits at redhat.com  Fri Feb 10 13:34:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:34:15 -0500
Subject: rpms/libksba/devel libksba.spec,1.16,1.17
Message-ID: <200602101334.k1ADYlDA030575@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	libksba.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libksba.spec	26 Jan 2006 19:39:33 -0000	1.16
+++ libksba.spec	10 Feb 2006 13:34:15 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 0.9.13
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Wed Nov 30 2005 Rex Dieter  0.9.13-2
 - remove hacks
 - drop self Obsoletes



From fedora-extras-commits at redhat.com  Fri Feb 10 13:35:50 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:35:50 -0500
Subject: rpms/libassuan/devel libassuan.spec,1.11,1.12
Message-ID: <200602101336.k1ADaMkB030636@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	libassuan.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libassuan.spec	24 Oct 2005 15:31:56 -0000	1.11
+++ libassuan.spec	10 Feb 2006 13:35:50 -0000	1.12
@@ -2,7 +2,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
 Version: 0.6.10
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 
 License: LGPL
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Mon Jul  4 2005 Michael Schwendt  - 0.6.10-2
 - Build PIC only for x86_64.
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:37:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:37:58 -0500
Subject: rpms/kxdocker/devel kxdocker.spec,1.3,1.4
Message-ID: <200602101338.k1ADcUq0030697@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kxdocker.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kxdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kxdocker/devel/kxdocker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kxdocker.spec	10 Nov 2005 19:27:46 -0000	1.3
+++ kxdocker.spec	10 Feb 2006 13:37:58 -0000	1.4
@@ -2,7 +2,7 @@
 Name:    kxdocker
 Summary: A Mac OSX style docker
 Version: 0.39
-Release: 3%{?dist} 
+Release: 3%{?dist}.1
 
 License: GPL
 Group:   User Interface/Desktops
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter  0.39-3
 - fix symlinks
 - simplify configure



From fedora-extras-commits at redhat.com  Fri Feb 10 13:39:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:39:11 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.9,1.10
Message-ID: <200602101339.k1ADdhbt030758@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kmymoney2.spec	31 Dec 2005 21:14:55 -0000	1.9
+++ kmymoney2.spec	10 Feb 2006 13:39:11 -0000	1.10
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Sat Dec 31 2005 Rex Dieter  0.8.2-1
 - 0.8.2
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:41:12 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Fri, 10 Feb 2006 08:41:12 -0500
Subject: rpms/mlmmj/devel mlmmj.spec,1.19,1.20
Message-ID: <200602101341.k1ADfiYC030821@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	mlmmj.spec 
Log Message:
* Fri Feb 10 2006 Michael Fleming  1.2.11-2
- Bump for newer gcc/glibc



Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mlmmj.spec	23 Jan 2006 22:42:20 -0000	1.19
+++ mlmmj.spec	10 Feb 2006 13:41:12 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
 Version: 1.2.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Fri Feb 10 2006 Michael Fleming  1.2.11-2
+- Bump for newer gcc/glibc
+
 * Tue Jan 24 2006 Michael Fleming  1.2.11-1
 - New upstream release (more bugfixes in address handling)
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:41:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:41:55 -0500
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.9,1.10
Message-ID: <200602101342.k1ADgRWN030882@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kipi-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30831

Modified Files:
	kipi-plugins.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kipi-plugins.spec	10 Nov 2005 19:20:27 -0000	1.9
+++ kipi-plugins.spec	10 Feb 2006 13:41:55 -0000	1.10
@@ -4,7 +4,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.0
-Release: 0.4.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}.1
 
 License: LGPL
 Group:   Applications/Multimedia
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter  0.1.1-0.5.rc1
 - fix symlinks
 - simplify configure



From fedora-extras-commits at redhat.com  Fri Feb 10 13:43:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:43:08 -0500
Subject: rpms/kiosktool/devel kiosktool.spec,1.4,1.5
Message-ID: <200602101343.k1ADhe3N030958@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kiosktool.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kiosktool.spec
===================================================================
RCS file: /cvs/extras/rpms/kiosktool/devel/kiosktool.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kiosktool.spec	10 Nov 2005 19:34:37 -0000	1.4
+++ kiosktool.spec	10 Feb 2006 13:43:08 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: KIOSK administration tool for KDE
 Name:	 kiosktool
 Version: 1.0
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 License: GPL
 Group:	 System Environment/Base
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter  1.0-5
 - --enable-final
 - fix symlinks



From fedora-extras-commits at redhat.com  Fri Feb 10 13:43:39 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Fri, 10 Feb 2006 08:43:39 -0500
Subject: rpms/mod_security/devel mod_security.spec,1.10,1.11
Message-ID: <200602101344.k1ADiBrh031007@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	mod_security.spec 
Log Message:
* Fri Feb 10 2006 Michael Fleming  1.9.2-2
- Bump for newer gcc/glibc



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_security.spec	18 Jan 2006 02:14:08 -0000	1.10
+++ mod_security.spec	10 Feb 2006 13:43:39 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 1.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -40,6 +40,9 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:45:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:45:23 -0500
Subject: rpms/kimdaba/devel kimdaba.spec,1.4,1.5
Message-ID: <200602101345.k1ADjtjk031093@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kimdaba.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kimdaba.spec
===================================================================
RCS file: /cvs/extras/rpms/kimdaba/devel/kimdaba.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kimdaba.spec	10 Nov 2005 19:32:12 -0000	1.4
+++ kimdaba.spec	10 Feb 2006 13:45:23 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: KDE Image Database
 Name:	 kimdaba
 Version: 2.1
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter  2.1-6
 - relative symlinks
 - simplify configure



From fedora-extras-commits at redhat.com  Fri Feb 10 13:46:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:46:22 -0500
Subject: rpms/kile/devel kile.spec,1.22,1.23
Message-ID: <200602101346.k1ADkso1031154@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kile.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kile.spec	2 Feb 2006 14:24:34 -0000	1.22
+++ kile.spec	10 Feb 2006 13:46:21 -0000	1.23
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.8.1
-Release: 7%{?dist}
+Release: 7%{?dist}.1
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter  1.8.3-7
 - fix symlinks
 - simplify configure



From fedora-extras-commits at redhat.com  Fri Feb 10 13:47:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:47:43 -0500
Subject: rpms/sbcl/devel sbcl.spec,1.35,1.36
Message-ID: <200602101348.k1ADmFm3031215@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
define sbcl_shell to allow ./install.sh to run properly



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sbcl.spec	10 Feb 2006 13:20:21 -0000	1.35
+++ sbcl.spec	10 Feb 2006 13:47:42 -0000	1.36
@@ -9,11 +9,12 @@
 
 # shell to use
 #define sbcl_shell /bin/bash -x
+%define sbcl_shell /bin/bash 
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.9
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 
 License: BSD/MIT
 Group: 	 Development/Languages



From fedora-extras-commits at redhat.com  Fri Feb 10 13:50:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:50:01 -0500
Subject: rpms/kickpim/devel kickpim.spec,1.12,1.13
Message-ID: <200602101350.k1ADoX7e031305@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kickpim.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kickpim.spec
===================================================================
RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kickpim.spec	10 Nov 2005 19:02:41 -0000	1.12
+++ kickpim.spec	10 Feb 2006 13:50:01 -0000	1.13
@@ -2,7 +2,7 @@
 Name:    kickpim
 Summary: KDE kicker applet to access addressbook
 Version: 0.5.3
-Release: 9%{?dist} 
+Release: 9%{?dist}.1
 
 License: GPL
 Group:   Applications/Productivity
@@ -81,7 +81,7 @@
 %doc AUTHORS README
 %{_libdir}/lib*
 %{_datadir}/apps/kicker/applets/*.desktop
-%{_datadir}/apps/kickpim
+%{_datadir}/apps/kickpim/
 
 
 %clean
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Fri Nov 04 2005 Rex Dieter  0.5.3-9
 - drop useless macros
 - drop redundant %%doc



From fedora-extras-commits at redhat.com  Fri Feb 10 13:50:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:50:59 -0500
Subject: rpms/kickpim/devel kickpim.spec,1.13,1.14
Message-ID: <200602101351.k1ADpVZh031362@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kickpim.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kickpim.spec
===================================================================
RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kickpim.spec	10 Feb 2006 13:50:01 -0000	1.13
+++ kickpim.spec	10 Feb 2006 13:50:59 -0000	1.14
@@ -2,7 +2,7 @@
 Name:    kickpim
 Summary: KDE kicker applet to access addressbook
 Version: 0.5.3
-Release: 9%{?dist}.1
+Release: 9%{?dist}.2
 
 License: GPL
 Group:   Applications/Productivity



From fedora-extras-commits at redhat.com  Fri Feb 10 13:52:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:52:30 -0500
Subject: rpms/kdocker/devel kdocker.spec,1.4,1.5
Message-ID: <200602101353.k1ADr3ne031426@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kdocker.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdocker.spec	26 Jan 2006 18:22:09 -0000	1.4
+++ kdocker.spec	10 Feb 2006 13:52:30 -0000	1.5
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 4%{?dist}.1
+Release: 4%{?dist}.3
 
 Group:   User Interface/Desktops
 License: GPL
@@ -60,7 +60,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
 qmake DESTDIR=$RPM_BUILD_ROOT 
+sed -i -e '/^\s*-\?strip /d' Makefile # naughty qmake
 
 make install 
 
@@ -101,6 +104,9 @@
 
 
 %changelog 
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Sat Jan 21 2006 Rex Dieter  1.3-4
 - .desktop: fix path to app-icon (#178531)
 



From fedora-extras-commits at redhat.com  Fri Feb 10 13:54:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:54:44 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.12,1.13
Message-ID: <200602101355.k1ADtHX4031492@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kasablanca.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kasablanca.spec	19 Jan 2006 15:57:47 -0000	1.12
+++ kasablanca.spec	10 Feb 2006 13:54:44 -0000	1.13
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 7%{?dist}
+Release: 7%{?dist}.2
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -40,7 +40,7 @@
 
 # Needed(?) for older/legacy setups, harmless otherwise
 if pkg-config openssl ; then
-  export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
 fi
 
 %configure \
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Jan 19 2006 Rex Dieter  0.4.0.2-7
 - drop x-modular hack(s) (kdelibs-devel fixed)
 - .desktop: GenericName=FTP client



From fedora-extras-commits at redhat.com  Fri Feb 10 13:56:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:56:56 -0500
Subject: rpms/jasper/devel jasper.spec,1.9,1.10
Message-ID: <200602101357.k1ADvSdx031553@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	jasper.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jasper.spec	31 Jan 2006 16:43:46 -0000	1.9
+++ jasper.spec	10 Feb 2006 13:56:56 -0000	1.10
@@ -9,7 +9,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 9%{?dist}
+Release: 9%{?dist}.1
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Tue Jan 31 2006 Rex Dieter  1.701.0-9
 - workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
   (#179464)



From fedora-extras-commits at redhat.com  Fri Feb 10 13:58:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:58:17 -0500
Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.17,1.18
Message-ID: <200602101358.k1ADwnAb031616@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31599

Modified Files:
	gtk-qt-engine.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gtk-qt-engine.spec	23 Jan 2006 16:01:00 -0000	1.17
+++ gtk-qt-engine.spec	10 Feb 2006 13:58:16 -0000	1.18
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 7%{?dist}
+Release: 7%{?dist}.1
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -109,6 +109,9 @@
 
 
 %changelog 
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Mon Jan 23 2006 Rex Dieter  0.60-7
 - don't dup "GTK Styles and fonts" in KDE menu(s)
 - drop Req: kdebase



From fedora-extras-commits at redhat.com  Fri Feb 10 13:59:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 08:59:32 -0500
Subject: rpms/gsview/devel gsview.spec,1.15,1.16
Message-ID: <200602101400.k1AE05uR031686@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gsview.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gsview.spec	26 Jan 2006 17:59:32 -0000	1.15
+++ gsview.spec	10 Feb 2006 13:59:32 -0000	1.16
@@ -1,9 +1,8 @@
-# $Id$
 
 Summary: PostScript and PDF previewer
 Name: 	 gsview
 Version: 4.7
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 License: Aladdin Free Public License, Ghostgum Software Pty Ltd
 Group: 	 Applications/Publishing
@@ -123,6 +122,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Fri Oct 21 2005 Rex Dieter  4.7-5
 - %%post/%%postun: update-desktop-database 
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:00:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:00:42 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.30,1.31
Message-ID: <200602101401.k1AE1Emv001029@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gnupg2.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnupg2.spec	20 Dec 2005 13:32:53 -0000	1.30
+++ gnupg2.spec	10 Feb 2006 14:00:42 -0000	1.31
@@ -7,7 +7,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.20
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 Group:   Applications/System
@@ -156,6 +156,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Tue Dec 20 2005 Rex Dieter  1.9.20-1
 - 1.9.20
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:02:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:02:30 -0500
Subject: rpms/gift/devel gift.spec,1.2,1.3
Message-ID: <200602101403.k1AE39qp001138@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gift.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gift.spec	6 Jan 2006 13:12:24 -0000	1.2
+++ gift.spec	10 Feb 2006 14:02:30 -0000	1.3
@@ -10,7 +10,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 4%{?dist} 
+Release: 4%{?dist}.1
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Fri Jan 06 2006 Rex Dieter  0.11.8.1-4
 - giftd.sh (wrapper): pass on command-line params/options
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:04:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:04:16 -0500
Subject: rpms/gift-openft/devel gift-openft.spec,1.1,1.2
Message-ID: <200602101404.k1AE4mRV001206@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1186

Modified Files:
	gift-openft.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: gift-openft.spec
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/devel/gift-openft.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gift-openft.spec	20 Dec 2005 14:26:45 -0000	1.1
+++ gift-openft.spec	10 Feb 2006 14:04:16 -0000	1.2
@@ -2,7 +2,7 @@
 Summary: Openft plugin for giFT 
 Name:	 gift-openft	
 Version: 0.2.1.6
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 
 License: GPL
 Group:	 System Environment/Libraries
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Mon Dec 19 2005 Rex Dieter 

Author: rdieter

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

Modified Files:
	geomview.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geomview.spec	3 Jan 2006 19:40:54 -0000	1.6
+++ geomview.spec	10 Feb 2006 14:06:29 -0000	1.7
@@ -9,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.2.cvs%{cvs}%{?dist}
+Release: 0.2.cvs%{cvs}%{?dist}.2
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -249,6 +249,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Tue Jan 03 2006 Rex Dieter  1.8.2-0.2.cvs20040221
 - rework Obsoletes/Provides: geomview-plugins
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:14:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:14:03 -0500
Subject: rpms/dxpc/devel dxpc.spec,1.8,1.9
Message-ID: <200602101414.k1AEEZvt001431@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	dxpc.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: dxpc.spec
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dxpc.spec	30 Jan 2006 16:26:48 -0000	1.8
+++ dxpc.spec	10 Feb 2006 14:14:03 -0000	1.9
@@ -2,13 +2,13 @@
 Summary: Differential X Protocol Compressor
 Name:    dxpc
 Version: 3.8.2
-Release: 3%{?dist} 
+Release: 3%{?dist}.1
 
 License: BSD
 Group:	 User Interface/X
 URL:     http://www.vigor.nu/dxpc/
 Source:  http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: dxpc-3.8.2-mandir.patch
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Mon Jan 30 2006 Rex Dieter  3.8.2-3
 - drop BR: XFree86-devel (#179283)
 - add BR: xorg-x11-devel/libXt-devel (#179283)



From fedora-extras-commits at redhat.com  Fri Feb 10 14:22:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:22:18 -0500
Subject: rpms/digikamimageplugins/devel digikamimageplugins.spec,1.11,1.12
Message-ID: <200602101422.k1AEMplS001577@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	digikamimageplugins.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: digikamimageplugins.spec
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/devel/digikamimageplugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- digikamimageplugins.spec	1 Dec 2005 21:10:16 -0000	1.11
+++ digikamimageplugins.spec	10 Feb 2006 14:22:18 -0000	1.12
@@ -2,7 +2,7 @@
 Name:    digikamimageplugins
 Summary: Plugins for Digikam
 Version: 0.8.0
-Release: 1%{?dist} 
+Release: 1%{?dist}.1
 
 License: GPL
 Group:   Applications/Multimedia
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Dec 01 2005 Rex Dieter  0.8.0-1
 - 0.8.0
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:24:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:24:02 -0500
Subject: rpms/apollon/devel apollon.spec,1.2,1.3
Message-ID: <200602101424.k1AEOYIt001638@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	apollon.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: apollon.spec
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/apollon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apollon.spec	26 Jan 2006 18:36:00 -0000	1.2
+++ apollon.spec	10 Feb 2006 14:24:02 -0000	1.3
@@ -2,7 +2,7 @@
 Summary: Filesharing client
 Name:	 apollon
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 
 License: GPL
 Group: 	 Applications/Internet
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu Jan 26 2006 Rex Dieter  1.0.1-4
 - drop libacl hack
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:25:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:25:12 -0500
Subject: rpms/gpgme/devel gpgme.spec,1.12,1.13
Message-ID: <200602101425.k1AEPidb001699@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gpgme.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gpgme.spec	11 Oct 2005 15:23:57 -0000	1.12
+++ gpgme.spec	10 Feb 2006 14:25:12 -0000	1.13
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}.1
 
 License: LGPL
 Group:   Applications/System
@@ -16,7 +16,7 @@
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
 BuildRequires: libgpg-error-devel >= 0.5
-BuildRequires: pth-devel
+BuildRequires: pth-devel >= 2.0.4
 
 Requires: gnupg >= 1.2.2
 Requires: gnupg2 >= 1.9.6
@@ -30,7 +30,7 @@
 management.
 
 %package devel
-Summary:  Libraries and header files from GPGME, GnuPG Made Easy
+Summary:  Development headers and libraries for %{name}
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libgpg-error-devel
@@ -63,7 +63,8 @@
 
 
 %check || :
-make check
+# expect 1(+?) errors with gnupg < 1.2.4
+make check 
 
 
 %clean
@@ -98,6 +99,12 @@
 
 
 %changelog
+* Fri Feb 10 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
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:26:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:26:38 -0500
Subject: rpms/factory/devel factory.spec,1.12,1.13
Message-ID: <200602101427.k1AERC5A001766@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	factory.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: factory.spec
===================================================================
RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- factory.spec	7 Sep 2005 14:14:06 -0000	1.12
+++ factory.spec	10 Feb 2006 14:26:38 -0000	1.13
@@ -1,13 +1,12 @@
-# $Id$
 
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
 Version: 2.0.5
-Release: 6
+Release: 6%{?dist}.1
 
 License: GPL
-URL:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory
-Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz
+URL:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/
+Source:  http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/factory-2-0-5.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,6 +64,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Thu May 26 2005 Jeremy Katz  - 2.0.5-6
 - fix build on 64bit arches
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:27:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:27:55 -0500
Subject: rpms/libfac/devel libfac.spec,1.9,1.10
Message-ID: <200602101428.k1AESSBD001835@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	libfac.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter 
- fc5: gcc/glibc respin



Index: libfac.spec
===================================================================
RCS file: /cvs/extras/rpms/libfac/devel/libfac.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libfac.spec	8 Aug 2005 15:46:31 -0000	1.9
+++ libfac.spec	10 Feb 2006 14:27:55 -0000	1.10
@@ -1,9 +1,8 @@
-# $Id$
 
-Summary: Extension to Singular-factory
+Summary: An extension to Singular-factory
 Name:    libfac
 Version: 2.0.5
-Release: 3%{?dist}
+Release: 3%{?dist}.1
 
 License: GPL
 Url:     http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/
@@ -13,7 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: factory-devel >= 2.0.5
-#BuildRequires: autoconf >= 2.53
+#BuildRequires: autoconf 
 
 %description
 Singular-libfac is an extension to Singular-factory which implements
@@ -70,6 +69,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Rex Dieter 
+- fc5: gcc/glibc respin
+
 * Sun May 22 2005 Jeremy Katz  - 2.0.5-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:32:56 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 10 Feb 2006 09:32:56 -0500
Subject: rpms/php-pear-DB/devel php-pear-DB.spec,1.1,1.2
Message-ID: <200602101433.k1AEXSTk001935@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-serv1918

Modified Files:
	php-pear-DB.spec 
Log Message:
Checkin 1.7.6-4



Index: php-pear-DB.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/php-pear-DB.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-DB.spec	24 Jan 2006 16:09:07 -0000	1.1
+++ php-pear-DB.spec	10 Feb 2006 14:32:55 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: PEAR: Database Abstraction Layer
 Name: php-pear-DB
 Version: 1.7.6
-Release: 3
+Release: 4
 License: The PHP License
 Group: Development/Libraries
 Source0: http://pear.php.net/get/DB-%{version}.tgz
@@ -66,15 +66,15 @@
 rm -rf %{buildroot}/docs
 
 # Install XML package description
-mkdir -p %{buildroot}%{_var}/lib/pear
+mkdir -p %{buildroot}%{_libdir}/php/pear
 tar -xzf %{SOURCE0} package.xml
-cp -p package.xml %{buildroot}%{_var}/lib/pear/DB.xml
+cp -p package.xml %{buildroot}%{_libdir}/php/pear/DB.xml
 
 %clean
 rm -rf %{buildroot}
 
 %post
-pear install --nodeps --soft --force --register-only %{_var}/lib/pear/DB.xml >/dev/null
+pear install --nodeps --soft --force --register-only %{_libdir}/php/pear/DB.xml >/dev/null
 
 %postun
 if [ "$1" -eq "0" ]; then
@@ -84,12 +84,15 @@
 %files
 %defattr(-,root,root)
 %doc doc/IDEAS doc/MAINTAINERS doc/STATUS doc/TESTERS
-%{_var}/lib/pear/DB.xml
+%{_libdir}/php/pear/DB.xml
 %{peardir}/tests/DB
 %{peardir}/DB.php
 %{peardir}/DB
 
 %changelog
+* Tue Jan 24 2006 Tim Jackson  1.7.6-4
+- Move package XML file to _libdir/php/pear rather than _var/lib/pear
+
 * Tue Jan 24 2006 Tim Jackson  1.7.6-3
 - Requires(post,postun) php-pear
 



From fedora-extras-commits at redhat.com  Fri Feb 10 14:40:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Feb 2006 09:40:46 -0500
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.10,1.11
Message-ID: <200602101441.k1AEfIfa002018@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kipi-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2001

Modified Files:
	kipi-plugins.spec 
Log Message:
* Fri Feb 10 2006 Rex Dieter  0.1.1-0.6.rc1
- BR: libGL-devel
- fc5: gcc/glibc respin



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kipi-plugins.spec	10 Feb 2006 13:41:55 -0000	1.10
+++ kipi-plugins.spec	10 Feb 2006 14:40:46 -0000	1.11
@@ -4,7 +4,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.0
-Release: 0.4.%{beta}%{?dist}.1
+Release: 0.6.%{beta}%{?dist}
 
 License: LGPL
 Group:   Applications/Multimedia
@@ -18,6 +18,7 @@
 BuildRequires: gphoto2-devel >= 2.0.0
 BuildRequires: imlib2-devel >= 1.1.0
 BuildRequires: kdelibs-devel >= 6:3.4
+BuildRequires: libGL-devel 
 
 ## (mostly) Essential
 Requires: ImageMagick 
@@ -75,7 +76,7 @@
 
 %configure \
   --disable-rpath \
-  --disable-debug --disable-warnings \ 
+  --disable-debug --disable-warnings \
   --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
@@ -131,7 +132,8 @@
 
 
 %changelog
-* Fri Feb 10 2006 Rex Dieter 
+* Fri Feb 10 2006 Rex Dieter  0.1.1-0.6.rc1
+- BR: libGL-devel
 - fc5: gcc/glibc respin
 
 * Thu Nov 10 2005 Rex Dieter  0.1.1-0.5.rc1



From fedora-extras-commits at redhat.com  Fri Feb 10 15:18:26 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Fri, 10 Feb 2006 10:18:26 -0500
Subject: rpms/denyhosts/FC-4 denyhosts-2.0-daemon-control.patch, NONE,
	1.1 denyhosts-2.0-setup.patch, NONE, 1.1 denyhosts.spec, 1.7,
	1.8 sources, 1.8, 1.9 denyhosts-0.9.8-setup.patch, 1.1,
	NONE denyhosts-1.0.0-daemon-control.patch, 1.1, NONE
Message-ID: <200602101518.k1AFIwbp004077@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-2.0-daemon-control.patch denyhosts-2.0-setup.patch 
Removed Files:
	denyhosts-0.9.8-setup.patch 
	denyhosts-1.0.0-daemon-control.patch 
Log Message:
* Sat Feb  4 2006 Jason L Tibbitts III  - 2.0-1
- Update to 2.0.


denyhosts-2.0-daemon-control.patch:

--- NEW FILE denyhosts-2.0-daemon-control.patch ---
--- daemon-control-dist.orig	2006-02-03 22:13:05.000000000 -0600
+++ daemon-control-dist	2006-02-04 15:14:02.758336216 -0600
@@ -13,7 +13,7 @@
 
 DENYHOSTS_BIN   = "/usr/bin/denyhosts.py"
 DENYHOSTS_LOCK  = "/var/lock/subsys/denyhosts"
-DENYHOSTS_CFG   = "/usr/share/denyhosts/denyhosts.cfg"
+DENYHOSTS_CFG   = "/etc/denyhosts.conf"
 
 
 ###############################################

denyhosts-2.0-setup.patch:

--- NEW FILE denyhosts-2.0-setup.patch ---
--- setup.py.orig	2006-01-16 18:02:18.000000000 -0600
+++ setup.py	2006-02-04 15:10:37.104646027 -0600
@@ -22,13 +22,13 @@
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
       ##py_modules=["denyhosts_version"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("denyhosts-daemon-initscript")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
-                  (libpath, glob("LICENSE.txt"))],
+#      data_files=[(libpath, glob("denyhosts.cfg-dist")),
+#                  (libpath, glob("denyhosts-daemon-initscript")),
+#                  (libpath, glob("setup.py")),
+#                  (libpath, glob("daemon-control-dist")),
+#                  (libpath, glob("CHANGELOG.txt")),
+#                  (libpath, glob("README.txt")),
+#                  (libpath, glob("LICENSE.txt"))],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- denyhosts.spec	14 Jan 2006 17:44:10 -0000	1.7
+++ denyhosts.spec	10 Feb 2006 15:18:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        1.1.4
-release:	2%{?dist}
+Version:        2.0
+release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,14 +14,17 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-1.1.4-config.patch
-Patch1:		denyhosts-0.9.8-setup.patch
-Patch2:		denyhosts-1.0.0-daemon-control.patch
+Patch1:		denyhosts-2.0-setup.patch
+Patch2:		denyhosts-2.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
 BuildRequires:  python-devel
 Requires:       openssh-server
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+
 %description
 DenyHosts is a Python script that analyzes the sshd server log
 messages to determine which hosts are attempting to hack into your
@@ -41,15 +44,14 @@
 
 
 %build
-python ./setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
-
 install -d $RPM_BUILD_ROOT%{_initrddir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -73,6 +75,8 @@
   touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
 done
 
+rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,10 +98,17 @@
 exit 0
 
 
-%files -f %{name}.files
+%files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
 %doc README.fedora README.txt setup.py
+
+%{_bindir}/denyhosts.py
+%{_bindir}/denyhosts-control
+%{python_sitelib}/DenyHosts/*.py
+%{python_sitelib}/DenyHosts/*.pyc
+%ghost %{python_sitelib}/DenyHosts/*.pyo
+
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts
@@ -116,9 +127,22 @@
 %dir %{_localstatedir}/lib/denyhosts
 
 %{_initrddir}/denyhosts
-%{_bindir}/denyhosts-control
+
+
 
 %changelog
+* Sat Feb  4 2006 Jason L Tibbitts III  - 2.0-1
+- Update to 2.0.
+
+* Mon Jan 30 2006 Jason L Tibbitts III  - 1.1.4-5
+- Redo installation to match current Python packaging guidelines.
+
+* Mon Jan 30 2006 Jason L Tibbitts III  - 1.1.4-4
+- Simplify "[ -f ... ] && rm" to "rm -f".
+
+* Mon Jan 30 2006 Jason L Tibbitts III  - 1.1.4-3
+- Delete stray .pyo and .pyc files that appear for no reason.
+
 * Fri Jan 13 2006 Jason L Tibbitts III  - 1.1.4-2
 - Clean up %post script; just call condrestart and don't bother with
   the call to --upgrade099.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jan 2006 17:44:10 -0000	1.8
+++ sources	10 Feb 2006 15:18:26 -0000	1.9
@@ -1 +1 @@
-f4b9beb55cc36ab44fb7fe0c96210734  DenyHosts-1.1.4.tar.gz
+9aa861692f52f6a0cdd3834122f53e04  DenyHosts-2.0.tar.gz


--- denyhosts-0.9.8-setup.patch DELETED ---


--- denyhosts-1.0.0-daemon-control.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Feb 10 15:21:54 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Fri, 10 Feb 2006 10:21:54 -0500
Subject: rpms/denyhosts/FC-3 denyhosts-2.0-daemon-control.patch, NONE,
	1.1 denyhosts-2.0-setup.patch, NONE, 1.1 denyhosts.spec, 1.7,
	1.8 sources, 1.8, 1.9 denyhosts-0.9.8-setup.patch, 1.1,
	NONE denyhosts-1.0.0-daemon-control.patch, 1.1, NONE
Message-ID: <200602101522.k1AFMRgI004166@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-2.0-daemon-control.patch denyhosts-2.0-setup.patch 
Removed Files:
	denyhosts-0.9.8-setup.patch 
	denyhosts-1.0.0-daemon-control.patch 
Log Message:
* Sat Feb  4 2006 Jason L Tibbitts III  - 2.0-1
- Update to 2.0.


denyhosts-2.0-daemon-control.patch:

--- NEW FILE denyhosts-2.0-daemon-control.patch ---
--- daemon-control-dist.orig	2006-02-03 22:13:05.000000000 -0600
+++ daemon-control-dist	2006-02-04 15:14:02.758336216 -0600
@@ -13,7 +13,7 @@
 
 DENYHOSTS_BIN   = "/usr/bin/denyhosts.py"
 DENYHOSTS_LOCK  = "/var/lock/subsys/denyhosts"
-DENYHOSTS_CFG   = "/usr/share/denyhosts/denyhosts.cfg"
+DENYHOSTS_CFG   = "/etc/denyhosts.conf"
 
 
 ###############################################

denyhosts-2.0-setup.patch:

--- NEW FILE denyhosts-2.0-setup.patch ---
--- setup.py.orig	2006-01-16 18:02:18.000000000 -0600
+++ setup.py	2006-02-04 15:10:37.104646027 -0600
@@ -22,13 +22,13 @@
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
       ##py_modules=["denyhosts_version"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("denyhosts-daemon-initscript")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
-                  (libpath, glob("LICENSE.txt"))],
+#      data_files=[(libpath, glob("denyhosts.cfg-dist")),
+#                  (libpath, glob("denyhosts-daemon-initscript")),
+#                  (libpath, glob("setup.py")),
+#                  (libpath, glob("daemon-control-dist")),
+#                  (libpath, glob("CHANGELOG.txt")),
+#                  (libpath, glob("README.txt")),
+#                  (libpath, glob("LICENSE.txt"))],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- denyhosts.spec	14 Jan 2006 17:47:12 -0000	1.7
+++ denyhosts.spec	10 Feb 2006 15:21:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        1.1.4
-release:	2%{?dist}
+Version:        2.0
+release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,14 +14,17 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-1.1.4-config.patch
-Patch1:		denyhosts-0.9.8-setup.patch
-Patch2:		denyhosts-1.0.0-daemon-control.patch
+Patch1:		denyhosts-2.0-setup.patch
+Patch2:		denyhosts-2.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
 BuildRequires:  python-devel
 Requires:       openssh-server
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+
 %description
 DenyHosts is a Python script that analyzes the sshd server log
 messages to determine which hosts are attempting to hack into your
@@ -41,15 +44,14 @@
 
 
 %build
-python ./setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
-
 install -d $RPM_BUILD_ROOT%{_initrddir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -73,6 +75,8 @@
   touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
 done
 
+rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,10 +98,17 @@
 exit 0
 
 
-%files -f %{name}.files
+%files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
 %doc README.fedora README.txt setup.py
+
+%{_bindir}/denyhosts.py
+%{_bindir}/denyhosts-control
+%{python_sitelib}/DenyHosts/*.py
+%{python_sitelib}/DenyHosts/*.pyc
+%ghost %{python_sitelib}/DenyHosts/*.pyo
+
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts
@@ -116,9 +127,22 @@
 %dir %{_localstatedir}/lib/denyhosts
 
 %{_initrddir}/denyhosts
-%{_bindir}/denyhosts-control
+
+
 
 %changelog
+* Sat Feb  4 2006 Jason L Tibbitts III  - 2.0-1
+- Update to 2.0.
+
+* Mon Jan 30 2006 Jason L Tibbitts III  - 1.1.4-5
+- Redo installation to match current Python packaging guidelines.
+
+* Mon Jan 30 2006 Jason L Tibbitts III  - 1.1.4-4
+- Simplify "[ -f ... ] && rm" to "rm -f".
+
+* Mon Jan 30 2006 Jason L Tibbitts III  - 1.1.4-3
+- Delete stray .pyo and .pyc files that appear for no reason.
+
 * Fri Jan 13 2006 Jason L Tibbitts III  - 1.1.4-2
 - Clean up %post script; just call condrestart and don't bother with
   the call to --upgrade099.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jan 2006 17:47:12 -0000	1.8
+++ sources	10 Feb 2006 15:21:54 -0000	1.9
@@ -1 +1 @@
-f4b9beb55cc36ab44fb7fe0c96210734  DenyHosts-1.1.4.tar.gz
+9aa861692f52f6a0cdd3834122f53e04  DenyHosts-2.0.tar.gz


--- denyhosts-0.9.8-setup.patch DELETED ---


--- denyhosts-1.0.0-daemon-control.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Feb 10 17:00:47 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 10 Feb 2006 12:00:47 -0500
Subject: rpms/azureus/devel azureus-no-restart.patch, NONE,
	1.1 azureus-no-update-manager-AzureusCoreImpl.patch, NONE,
	1.1 azureus-no-update-manager-CorePatchChecker.patch, NONE,
	1.1 azureus-no-update-manager-CoreUpdateChecker.patch, NONE,
	1.1 azureus-no-update-manager-MainWindow.patch, NONE,
	1.1 azureus-no-update-manager-PluginInstallerImpl-2.patch, NONE,
	1.1 azureus-no-update-manager-PluginInstallerImpl.patch, NONE,
	1.1 azureus-no-update-manager-PluginUpdatePlugin.patch, NONE,
	1.1 azureus-no-update-manager-SWTUpdateChecker.patch, NONE,
	1.1 azureus-no-update-manager-TableView.patch, NONE,
	1.1 azureus-no-update-manager-UpdateMonitor.patch, NONE,
	1.1 azureus-no-updates-PluginInitializer.patch, NONE,
	1.1 azureus-no-updates-PluginInterfaceImpl.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 azureus.script, 1.6, 1.7 azureus.spec,
	1.16, 1.17 sources, 1.3, 1.4
Message-ID: <200602101701.k1AH1a4V008799@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	.cvsignore azureus.script azureus.spec sources 
Added Files:
	azureus-no-restart.patch 
	azureus-no-update-manager-AzureusCoreImpl.patch 
	azureus-no-update-manager-CorePatchChecker.patch 
	azureus-no-update-manager-CoreUpdateChecker.patch 
	azureus-no-update-manager-MainWindow.patch 
	azureus-no-update-manager-PluginInstallerImpl-2.patch 
	azureus-no-update-manager-PluginInstallerImpl.patch 
	azureus-no-update-manager-PluginUpdatePlugin.patch 
	azureus-no-update-manager-SWTUpdateChecker.patch 
	azureus-no-update-manager-TableView.patch 
	azureus-no-update-manager-UpdateMonitor.patch 
	azureus-no-updates-PluginInitializer.patch 
	azureus-no-updates-PluginInterfaceImpl.patch 
Log Message:
Update to latest cvs sources in preparation for 2.4.0.0 release candidate.
Disable all updates.
Integrate two plugins.  More coming.


azureus-no-restart.patch:

--- NEW FILE azureus-no-restart.patch ---
--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java~	2006-02-09 20:09:11.000000000 -0500
+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java	2006-02-09 20:09:17.000000000 -0500
@@ -171,17 +171,6 @@
       if(!Constants.isOSX) {
         new MenuItem(fileMenu, SWT.SEPARATOR);
 
-        MenuItem file_restart = new MenuItem(fileMenu, SWT.NULL);
-        Messages.setLanguageText(file_restart, "MainWindow.menu.file.restart"); //$NON-NLS-1$
-
-        file_restart.addListener(SWT.Selection, new Listener() {
-
-        public void handleEvent(Event event) {
-
-            MainWindow.getWindow().dispose(true,false);
-         }
-        });
-
         final MenuItem file_exit = new MenuItem(fileMenu, SWT.NULL);
         if(!COConfigurationManager.getBooleanParameter("Enable System Tray") || !COConfigurationManager.getBooleanParameter("Close To Tray")) {
             KeyBindings.setAccelerator(file_exit, "MainWindow.menu.file.exit");

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

--- NEW FILE azureus-no-update-manager-AzureusCoreImpl.patch ---
--- 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 @@
 			if (Logger.isEnabled())
 				Logger.log(new LogEvent(LOGID, "Stop operation completes"));
 	
-				// if any installers exist then we need to closedown via the updater
-			
-			if ( 	apply_updates && 
-					getPluginManager().getDefaultPluginInterface().getUpdateManager().getInstallers().length > 0 ){
-				
-				AzureusRestarterFactory.create( this ).restart( true );
-			}
 		}finally{
 			
 			stopping_sem.releaseForever();

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

--- NEW FILE azureus-no-update-manager-CorePatchChecker.patch ---
--- org/gudy/azureus2/update/CorePatchChecker.java.orig	2006-02-09 23:29:16.000000000 -0500
+++ org/gudy/azureus2/update/CorePatchChecker.java	2006-02-09 23:29:53.000000000 -0500
@@ -64,8 +64,6 @@
 				
 				System.out.println( "CorePatchChecker: TESTING !!!!" );
 			}
-			
-			plugin_interface.getUpdateManager().registerUpdatableComponent( this, false );
 		}
 	}
 	
@@ -86,18 +84,7 @@
 	checkForUpdate(
 		UpdateChecker	checker )
 	{
-		try{
-			UpdateCheckInstance	inst = checker.getCheckInstance();
-		
-			inst.addListener( this );
-		
-			checker.addUpdate( "Core Patch Checker", new String[0], "",
-								new ResourceDownloader[0],
-								Update.RESTART_REQUIRED_MAYBE );
-		}finally{
-			
-			checker.completed();
-		}
+	    checker.completed();
 	}
 	
 	public void

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

--- NEW FILE azureus-no-update-manager-CoreUpdateChecker.patch ---
--- 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 @@
 		props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
 		
 		rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
-	
-		plugin_interface.getUpdateManager().registerUpdatableComponent( this, true );
 	}
 	
 	public String
@@ -144,178 +142,9 @@
 	checkForUpdate(
 		final UpdateChecker	checker )
 	{
-		try{			
-			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);
-
-      
-			displayUserMessage( decoded );
-			
-			String latest_version 			= null;
-			String latest_file_name			= null;
-			
-			byte[] b_version = (byte[])decoded.get("version");
-			
-			if ( b_version != null ){
-			
-				latest_version = new String( b_version );
-				
-				plugin_interface.getPluginProperties().setProperty( LATEST_VERSION_PROPERTY, latest_version );
-				
-			}else{
-				
-				throw( new Exception( "No version found in reply" ));
-			}
-			
-			byte[] b_filename = (byte[]) decoded.get("filename");
-			
-			if ( b_filename != null ){
-			
-				latest_file_name = new String( b_filename );
-			}
-			
-			String	msg = "Core: latest_version = '" + latest_version + "', file = '" + latest_file_name + "'";
-			
-			checker.reportProgress( msg );
-			
-			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 ){
-				
-				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;
-			
-
-			ResourceDownloader[]	primary_mirrors;
-				
-			primary_mirrors = getPrimaryDownloaders( latest_file_name );
-
-				// the download hierarchy is primary mirrors first (randomised alternate)
-				// then backup mirrors (randomised alternate)
-			
-				// we don't want to load the backup mirrors until the primary mirrors fail
-			
-			ResourceDownloader		random_primary_mirrors = rdf.getRandomDownloader( primary_mirrors );
-			
-			ResourceDownloader		backup_downloader =
-				rdf.create(
-					new ResourceDownloaderDelayedFactory()
-					{
-						public ResourceDownloader
-						create()
-						{
-							ResourceDownloader[]	backup_mirrors = getBackupDownloaders( f_latest_file_name );
-						
-							return( rdf.getRandomDownloader( backup_mirrors ));
-						}
-					});
-			
-			ResourceDownloader	top_downloader = 
-				rdf.getAlternateDownloader( 
-						new ResourceDownloader[]
-							{
-								random_primary_mirrors,
-								backup_downloader,
-							});
-			
-
-			top_downloader.addListener( rd_logger );
-			
-				// get size so it is cached
-			
-			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" );
-			
-			String	info = null;
-			
-			if ( info_b != null ){
-			
-				try{
-					info = new String( info_b );
-				
-				}catch( Throwable e ){
-					
-					Debug.printStackTrace( e );
-				}
-			}
-			
-			String[]	desc;
-			
-			if ( info == null ){
-				
-				desc = new String[]{"Core Azureus Version" };
-				
-			}else{
-				
-				desc = new String[]{"Core Azureus Version", info };
-			}
-			
-			checker.addUpdate(
-						"Core Azureus Version",
-						desc,
-						latest_version,
-						top_downloader,
-						Update.RESTART_REQUIRED_YES );
-			
-		}catch( Throwable e ){
-			
-			log.log( e );
-			
-			Debug.printStackTrace( e );
-			
-			checker.failed();
-			
-		}finally{
-			
 			checker.completed();
 			
 			first_check = false;
-		}
 	}
 	
       

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

--- NEW FILE azureus-no-update-manager-MainWindow.patch ---
--- org/gudy/azureus2/ui/swt/mainwindow/MainWindow.java.orig	2006-02-09 23:26:57.000000000 -0500
+++ org/gudy/azureus2/ui/swt/mainwindow/MainWindow.java	2006-02-09 23:27:13.000000000 -0500
@@ -1772,12 +1772,6 @@
   private void 
   addUpdateListener() 
   {
-  	azureus_core.getPluginManager().getDefaultPluginInterface().getUpdateManager().addListener(new UpdateManagerListener () {
-      public void checkInstanceCreated(UpdateCheckInstance instance) {
-        
-      	new updateStatusChanger( instance );
-      }
-    });
   }  
   
   protected class

azureus-no-update-manager-PluginInstallerImpl-2.patch:

--- NEW FILE azureus-no-update-manager-PluginInstallerImpl-2.patch ---
--- org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.orig	2006-02-09 23:42:33.000000000 -0500
+++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2006-02-09 23:42:45.000000000 -0500
@@ -237,13 +237,6 @@
 					PluginManager.registerPlugin( dummy_plugin, plugin_id );
 				
 					PluginInterface dummy_plugin_interface = manager.getPluginInterfaceByID( plugin_id );
-					
-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
-							
-				}else{
-					
-					((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
-	
 				}
 			}
 		

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

--- NEW FILE azureus-no-update-manager-PluginInstallerImpl.patch ---
--- org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.orig	2006-02-09 23:30:18.000000000 -0500
+++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java	2006-02-09 23:32:16.000000000 -0500
@@ -177,13 +177,6 @@
 	{
 		PluginUpdatePlugin	pup = (PluginUpdatePlugin)manager.getPluginInterfaceByClass( PluginUpdatePlugin.class ).getPlugin();
 		
-		UpdateManager	uman = manager.getDefaultPluginInterface().getUpdateManager();
-		
-		UpdateCheckInstance	inst = 
-			uman.createEmptyUpdateCheckInstance( 
-					UpdateCheckInstance.UCI_INSTALL,
-					"update.instance.install" );
-		
 		try{
 			
 			for (int i=0;i 1 plugin interfaces, make the name up appropriately
-								
-								String	update_name = "";
-									
-								PluginInterface[]	ifs = manager.getPluginInterfaces();
-								
-							    Arrays.sort( 
-							    		ifs,
-									  	new Comparator()
-										{
-								      		public int 
-											compare(
-												Object o1, 
-												Object o2)
-								      		{
-								      			return(((PluginInterface)o1).getPluginName().compareTo(((PluginInterface)o2).getPluginName()));
-								      		}
-										});
-							    
-								for (int i=0;i check at start as well
-		
-		check_at_start = check_at_start || check_periodic;
-		
-		if (	( check_at_start && start_of_day) ||
-				( check_periodic && !start_of_day )){
-			
-			performCheck();	// this will implicitly do usage stats
-			
-		}else{
-
-			new DelayedEvent(
-					5000,
-					new AERunnable()
-					{
-						public void
-						runSupport()
-						{
-							if ( start_of_day ){
-                                MainWindow.getWindow().setStatusText("");
-							}
-
-							CoreUpdateChecker.doUsageStats();
-						}
-					});
-		}
 	}
 	
 	public void
 	performCheck()
 	{
-		if ( SystemProperties.isJavaWebStartInstance()){
-			
-				// just in case we get here somehome!
-			if (Logger.isEnabled())
-				Logger.log(new LogEvent(LOGID,
-						"skipping update check as java web start"));
-			
-			return;
-		}
 
-			// kill any existing update window
-		
-	    if ( current_update_window != null && ! current_update_window.isDisposed()){
-	    	
-	      SWTThread.getInstance().getDisplay().syncExec(
-	      		new AERunnable() 
-				{
-	      			public void 
-					runSupport() 
-	      			{               
-	      				current_update_window.dispose();
-	      			}
-	      		});
-	    }
-	    
-	    if ( current_update_instance != null ){
-	    	
-	    	current_update_instance.cancel();
-	    }
-	    
-		MainWindow mainWindow = MainWindow.getWindow();
-		
-	    mainWindow.setStatusText("MainWindow.status.checking ...");
-	    
-	    	// take this off this GUI thread in case it blocks for a while
-	    
-	   AEThread t = 
-		   	new AEThread( "UpdateMonitor:kickoff")
-				{
-			    	public void
-					runSupport()
-			    	{
-			    		UpdateManager um = azureus_core.getPluginManager().getDefaultPluginInterface().getUpdateManager(); 
-				
-			    		current_update_instance = 
-			    			um.createUpdateCheckInstance(
-			    				UpdateCheckInstance.UCI_UPDATE,
-			  					"update.instance.update" );
-			  	
-			    		current_update_instance.start();
-			    	}
-				};
-			
-		t.setDaemon( true );
-		
-		t.start();
 	}
 	
 	public void

azureus-no-updates-PluginInitializer.patch:

--- NEW FILE azureus-no-updates-PluginInitializer.patch ---
--- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig	2006-02-09 22:57:59.000000000 -0500
+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2006-02-09 23:01:31.000000000 -0500
@@ -47,11 +47,8 @@
 import org.gudy.azureus2.plugins.*;
 import org.gudy.azureus2.pluginsimpl.local.launch.PluginLauncherImpl;
 import org.gudy.azureus2.pluginsimpl.local.ui.UIManagerImpl;
-import org.gudy.azureus2.pluginsimpl.local.update.*;
 import org.gudy.azureus2.pluginsimpl.local.utils.UtilitiesImpl;
 
-import org.gudy.azureus2.update.UpdaterUpdateChecker;
-
 
 
 /**
@@ -93,11 +90,6 @@
    					"azbpsharehoster", 
    					"ShareHoster",
 					"true" },
-   			{	 PluginManagerDefaults.PID_PLUGIN_UPDATE_CHECKER, 
-   					"org.gudy.azureus2.pluginsimpl.update.PluginUpdatePlugin", 
-   					"azbppluginupdate", 
-   					"PluginUpdate",
-					"true" },
 			{	 PluginManagerDefaults.PID_CLIENT_ID, 
 				    "com.aelitis.azureus.plugins.clientid.ClientIDPlugin", 
 				    "azbpclientid", 
@@ -123,16 +115,6 @@
 					"azbpmagnet", 
 					"Magnet URI Handler",
 					"true" },
-			{	 PluginManagerDefaults.PID_CORE_UPDATE_CHECKER, 
-   					"org.gudy.azureus2.update.CoreUpdateChecker", 
-   					"azbpcoreupdater", 
-   					"CoreUpdater",
-					"true" },
-			{	 PluginManagerDefaults.PID_CORE_PATCH_CHECKER, 
-   					"org.gudy.azureus2.update.CorePatchChecker", 
-   					"azbpcorepatcher", 
-   					"CorePatcher",
-					"true" },
 	   		{	 PluginManagerDefaults.PID_JPC, 
 					"com.aelitis.azureus.plugins.jpc.JPCPlugin", 
 					"azjpc", 
@@ -297,11 +279,7 @@
   	
     listener 	= _listener;
     
-    UpdateManagerImpl.getSingleton( azureus_core );	// initialise the update manager
-       
     plugin_manager = PluginManagerImpl.getSingleton( this );
-    
-    UpdaterUpdateChecker.checkPlugin();
   }
   
   	public void 
@@ -823,16 +801,11 @@
 	      
 	      if ( load_failure != null ){
 	      		  
-	    	  	// don't complain about our internal one
-	    	  
-	    	  if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
-	    		  
 		      	String	msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
 		   	 
 		      	Logger.log(new LogAlert(LogAlert.UNREPEATABLE, msg, load_failure));
 	
 		      	System.out.println( msg + " : " + load_failure);
-		      }
 	      }
   		}
 	      

azureus-no-updates-PluginInterfaceImpl.patch:

--- NEW FILE azureus-no-updates-PluginInterfaceImpl.patch ---
--- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig	2006-02-09 23:03:10.000000000 -0500
+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java	2006-02-09 23:03:41.000000000 -0500
@@ -47,7 +47,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.ipfilter.IPFilter;
 import org.gudy.azureus2.plugins.tracker.Tracker;
 import org.gudy.azureus2.plugins.ui.config.Parameter;
@@ -409,7 +408,7 @@
   public UpdateManager
   getUpdateManager()
   {
-  	return( UpdateManagerImpl.getSingleton( initialiser.getAzureusCore()));
+      return( null );
   }
 
   public PeerProtocolManager


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Feb 2006 08:45:07 -0000	1.3
+++ .cvsignore	10 Feb 2006 17:00:46 -0000	1.4
@@ -1 +1,3 @@
-azureus2-cvs-20060207.tar.gz
+azplugins_1.8.8.jar
+azureus2-cvs-20060209.tar.gz
+bdcc_2.2.2.zip


Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- azureus.script	9 Feb 2006 08:45:07 -0000	1.6
+++ azureus.script	10 Feb 2006 17:00:46 -0000	1.7
@@ -1,8 +1,18 @@
 #!/bin/sh
 
+# Create the fake application dir.
 APPDIR=`(cd ~; pwd)`/.azureus/app
 if ! test -d $APPDIR; then
   mkdir -p $APPDIR;
 fi
 
-CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+# Reconstruct the plugins dir.
+rm -rf $APPDIR/plugins
+mkdir -p $APPDIR/plugins
+pushd $APPDIR/plugins
+for pdir in /usr/share/azureus/plugins/*; do
+  ln -s $pdir .;
+done;
+popd
+
+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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- azureus.spec	9 Feb 2006 09:41:56 -0000	1.16
+++ azureus.spec	10 Feb 2006 17:00:46 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           azureus
-Version:        2.3.0.7
-Release:        2.20060207cvs%{?dist}
+Version:        2.4.0.0
+Release:        0.20060209cvs%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@
 
 # A cvs snapshot with the build and bouncycastle directories
 # removed.
-Source0:        azureus2-cvs-20060207.tar.gz
+Source0:        azureus2-cvs-20060209.tar.gz
 
 Source1:        azureus.script
 Source2:        Azureus.desktop
@@ -17,6 +17,9 @@
 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
@@ -28,6 +31,19 @@
 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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +78,19 @@
 %patch8 -p0
 %patch9 -p0
 %patch10 -p0
+%patch11 -p0
+%patch12 -p0
+%patch13 -p0
+%patch14 -p0
+%patch15 -p0
+%patch16 -p0
+%patch17 -p0
+%patch18 -p0
+%patch19 -p0
+%patch20 -p0
+#%patch21 -p0
+%patch22 -p0
+%patch23 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
@@ -74,15 +103,42 @@
 find ./ -name [Ww]in32\* | xargs rm -r
 # Remove test code
 rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
+
 ant jar
 
+mkdir -p plugins/azplugins
+cd plugins/azplugins
+unzip -q %{SOURCE6}
+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}
+cd plugins/bdcc
+unzip *.jar
+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 bdcc_2.2.2.jar .
+cd ../..
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_javadir}/Azureus2.jar
+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
 
+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
+install -pm 644 plugins/azplugins/plugin.properties $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/plugin.properties
+
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/bdcc
+install -pm 644 plugins/bdcc/bdcc_2.2.2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/bdcc/bdcc_2.2.2.jar
+install -pm 644 plugins/bdcc/plugin.properties $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/bdcc/plugin.properties
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
@@ -139,10 +195,17 @@
 %{_datadir}/icons/hicolor/32x32/apps/azureus.png
 %{_datadir}/icons/hicolor/64x64/apps/azureus.png
 %{_bindir}/azureus
-%{_javadir}/*.jar
+%{_datadir}/azureus
 %{_libdir}/gcj/*
 
 %changelog
+* Fri Feb 10 2006 Anthony Green  - 2.4.0.0-0.20060207cvs
+- Update cvs sources.  Boost version number.
+- Move all jar files to /usr/share/azureus.
+- Add azplugins and bdcc.
+- Remove update and restart menu items.
+- Disable all updating.
+
 * Thu Feb  9 2006 Anthony Green  - 2.3.0.7-2.20060207cvs
 - Add libgconf dependency.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Feb 2006 08:45:07 -0000	1.3
+++ sources	10 Feb 2006 17:00:46 -0000	1.4
@@ -1 +1,3 @@
-e37850f30f7ff46d03b65bdf228c0025  azureus2-cvs-20060207.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 Feb 10 18:44:21 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 10 Feb 2006 13:44:21 -0500
Subject: rpms/evas - New directory
Message-ID: <200602101844.k1AIiNgK011208@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Fri Feb 10 18:44:27 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 10 Feb 2006 13:44:27 -0500
Subject: rpms/evas/devel - New directory
Message-ID: <200602101844.k1AIiTCv011224@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Fri Feb 10 18:45:01 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 10 Feb 2006 13:45:01 -0500
Subject: rpms/evas Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602101845.k1AIj3PA011276@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 10 18:45:07 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 10 Feb 2006 13:45:07 -0500
Subject: rpms/evas/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200602101845.k1AIj9FE011296@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


--- NEW 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 Feb 10 18:45:54 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Fri, 10 Feb 2006 13:45:54 -0500
Subject: rpms/denyhosts/devel denyhosts-2.1-setup.patch, NONE, 1.1 .cvsignore,
	1.15, 1.16 denyhosts.spec, 1.24, 1.25 sources, 1.15,
	1.16 denyhosts-2.0-setup.patch, 1.1, NONE
Message-ID: <200602101846.k1AIkQPZ011364@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	.cvsignore denyhosts.spec sources 
Added Files:
	denyhosts-2.1-setup.patch 
Removed Files:
	denyhosts-2.0-setup.patch 
Log Message:
* Fri Feb 10 2006 Jason L Tibbitts III  - 2.1-1
- Update to 2.1
- Package plugins and scripts.


denyhosts-2.1-setup.patch:

--- NEW FILE denyhosts-2.1-setup.patch ---
--- setup.py.orig	2006-02-09 19:03:39.000000000 -0600
+++ setup.py	2006-02-10 12:32:13.105596378 -0600
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                 ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Feb 2006 21:21:16 -0000	1.15
+++ .cvsignore	10 Feb 2006 18:45:54 -0000	1.16
@@ -1 +1 @@
-DenyHosts-2.0.tar.gz
+DenyHosts-2.1.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- denyhosts.spec	4 Feb 2006 21:21:16 -0000	1.24
+++ denyhosts.spec	10 Feb 2006 18:45:54 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           denyhosts
-Version:        2.0
+Version:        2.1
 release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-1.1.4-config.patch
-Patch1:		denyhosts-2.0-setup.patch
+Patch1:		denyhosts-2.1-setup.patch
 Patch2:		denyhosts-2.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -34,6 +34,7 @@
 to prevent future break-in attempts from that host.  Email reports can
 be sent to a system admin.
 
+
 %prep
 %setup -q -n DenyHosts-%{version}
 %patch0 -p0
@@ -42,6 +43,10 @@
 
 cp %{SOURCE6} .
 
+# This must be moved before the Python build process runs so that we
+# can include it as documentation.
+mv plugins/README.contrib .
+
 
 %build
 %{__python} setup.py build
@@ -49,6 +54,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -101,10 +107,11 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
-%doc README.fedora README.txt setup.py
+%doc README.fedora README.txt setup.py README.contrib
 
 %{_bindir}/denyhosts.py
 %{_bindir}/denyhosts-control
+%{_datadir}/denyhosts
 %{python_sitelib}/DenyHosts/*.py
 %{python_sitelib}/DenyHosts/*.pyc
 %ghost %{python_sitelib}/DenyHosts/*.pyo
@@ -129,8 +136,11 @@
 %{_initrddir}/denyhosts
 
 
-
 %changelog
+* Fri Feb 10 2006 Jason L Tibbitts III  - 2.1-1
+- Update to 2.1
+- Package plugins and scripts.
+
 * Sat Feb  4 2006 Jason L Tibbitts III  - 2.0-1
 - Update to 2.0.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Feb 2006 21:21:16 -0000	1.15
+++ sources	10 Feb 2006 18:45:54 -0000	1.16
@@ -1 +1 @@
-9aa861692f52f6a0cdd3834122f53e04  DenyHosts-2.0.tar.gz
+1c40bda86884901f125bfbce3d8c35cb  DenyHosts-2.1.tar.gz


--- denyhosts-2.0-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Feb 10 18:47:37 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 10 Feb 2006 13:47:37 -0500
Subject: rpms/evas import.log,1.1,1.2
Message-ID: <200602101848.k1AImAHn011467@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/evas/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Feb 2006 18:45:01 -0000	1.1
+++ import.log	10 Feb 2006 18:47:37 -0000	1.2
@@ -0,0 +1 @@
+evas-0_9_9_023-1:HEAD:evas-0.9.9.023-1.src.rpm:1139597248



From fedora-extras-commits at redhat.com  Fri Feb 10 18:47:45 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 10 Feb 2006 13:47:45 -0500
Subject: rpms/evas/devel evas-0.9.9.023-novera.patch, NONE, 1.1 evas.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602101848.k1AImHOr011476@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Added Files:
	evas-0.9.9.023-novera.patch evas.spec 
Log Message:
auto-import evas-0.9.9.023-1 on branch devel from evas-0.9.9.023-1.src.rpm

evas-0.9.9.023-novera.patch:

--- NEW FILE evas-0.9.9.023-novera.patch ---
--- evas-0.9.9.023/data/Makefile.in.novera	2006-02-04 21:37:36.000000000 -0500
+++ evas-0.9.9.023/data/Makefile.in	2006-02-04 21:37:50.000000000 -0500
@@ -198,9 +198,7 @@
 xcb_libs = @xcb_libs@
 MAINTAINERCLEANFILES = Makefile.in
 
-FILES = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf VeraMoBd.ttf \
-        VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf fonts.alias fonts.dir \
-        backdrop.png e_logo.png evas_logo.png panel.png \
+FILES = backdrop.png e_logo.png evas_logo.png panel.png \
         panel_shadow.png panel_top.png \
         t1.png t2.png test_pattern.png
 


--- NEW FILE evas.spec ---
Name:           evas
Version:        0.9.9.023
Release:        1%{?dist}
Summary:        A hardware-accelerated canvas API

Group:          System Environment/Libraries
License:        MIT
URL:            http://www.enlightenment.org/Libraries/Evas/
Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
Patch:          evas-0.9.9.023-novera.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  edb-devel eet-devel freetype-devel directfb-devel libpng-devel
BuildRequires:  libjpeg-devel
BuildRequires:  xorg-x11-devel

%description
Evas is a hardware-accelerated canvas API for X-Windows that can draw
anti-aliased text, smooth super and sub-sampled images, alpha-blend, as well
as drop down to using normal X11 primitives such as pixmaps, lines and
rectangles for speed if your CPU or graphics hardware are too slow.

Evas abstracts any need to know much about what the characteristics of your
XServer's display are, what depth or what magic visuals etc, it has. The most
you need to tell Evas is how many colors (at a maximum) to use if the display
is not a truecolor display.

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

%description    devel
The evas-devel package contains libraries and header files for developing
evas applications.

%prep
%setup -q
%patch -p 1 -b .novera

%build
%configure --disable-static --enable-directfb --enable-gl-x11
make %{?_smp_mflags}

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

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-PLAIN README
%{_bindir}/*_load
%{_bindir}/*_test
%{_bindir}/*_window
%{_datadir}/%{name}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc
%{_bindir}/%{name}-config
%{_includedir}/*.h
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%changelog
* Sun Feb  5 2006 Ignacio Vazquez-Abrams  0.9.9.023-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Feb 2006 18:45:07 -0000	1.1
+++ .cvsignore	10 Feb 2006 18:47:45 -0000	1.2
@@ -0,0 +1 @@
+evas-0.9.9.023.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Feb 2006 18:45:07 -0000	1.1
+++ sources	10 Feb 2006 18:47:45 -0000	1.2
@@ -0,0 +1 @@
+ca5528c8894d49cbdf77873f5974c0e8  evas-0.9.9.023.tar.gz



From fedora-extras-commits at redhat.com  Fri Feb 10 18:59:27 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 10 Feb 2006 13:59:27 -0500
Subject: rpms/bzr - New directory
Message-ID: <200602101859.k1AIxTgM011631@cvs-int.fedora.redhat.com>

Author: shahms

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

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




From fedora-extras-commits at redhat.com  Fri Feb 10 18:59:33 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 10 Feb 2006 13:59:33 -0500
Subject: rpms/bzr/devel - New directory
Message-ID: <200602101859.k1AIxZKY011647@cvs-int.fedora.redhat.com>

Author: shahms

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

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




From fedora-extras-commits at redhat.com  Fri Feb 10 18:59:45 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 10 Feb 2006 13:59:45 -0500
Subject: rpms/bzr Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602101859.k1AIxlec011683@cvs-int.fedora.redhat.com>

Author: shahms

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 10 18:59:51 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 10 Feb 2006 13:59:51 -0500
Subject: rpms/bzr/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200602101859.k1AIxrwv011703@cvs-int.fedora.redhat.com>

Author: shahms

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

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


--- NEW 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 Feb 10 19:00:18 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 10 Feb 2006 14:00:18 -0500
Subject: rpms/bzr import.log,1.1,1.2
Message-ID: <200602101900.k1AJ0oQO011790@cvs-int.fedora.redhat.com>

Author: shahms

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bzr/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Feb 2006 18:59:45 -0000	1.1
+++ import.log	10 Feb 2006 19:00:18 -0000	1.2
@@ -0,0 +1 @@
+bzr-0_7-1:HEAD:bzr-0.7-1.src.rpm:1139598015



From fedora-extras-commits at redhat.com  Fri Feb 10 19:00:25 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 10 Feb 2006 14:00:25 -0500
Subject: rpms/bzr/devel bzr-sys-etree.patch, NONE, 1.1 bzr.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602101900.k1AJ0vpf011796@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore sources 
Added Files:
	bzr-sys-etree.patch bzr.spec 
Log Message:
auto-import bzr-0.7-1 on branch devel from bzr-0.7-1.src.rpm

bzr-sys-etree.patch:

--- NEW FILE bzr-sys-etree.patch ---
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
@@ -30,9 +30,9 @@
 except ImportError:
     mutter('WARNING: using slower ElementTree; consider installing cElementTree'
            " and make sure it's on your PYTHONPATH")
-    from util.elementtree.ElementTree import (ElementTree, SubElement,
-                                              Element, XMLTreeBuilder,
-                                              fromstring, tostring)
+    from elementtree.ElementTree import (ElementTree, SubElement,
+                                         Element, XMLTreeBuilder,
+                                         fromstring, tostring)
 
 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',
                 'bzrlib.ui',
                 'bzrlib.util',
-                'bzrlib.util.elementtree',
                 'bzrlib.util.effbot.org',
                 'bzrlib.util.configobj',
                 ],


--- NEW FILE bzr.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           bzr
Version:        0.7
Release:        1
Summary:        Friendly distributed version control system

Group:          Development/Tools
License:        GPL
URL:            http://www.bazaar-ng.org/
Source0:        http://www.bazaar-ng.org/pkg/%{name}-%{version}.tar.gz
Patch0:         bzr-sys-etree.patch
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-elementtree

%description
Bazaar-NG is a distributed revision control system that is powerful, friendly,
and scalable. It is the successor of the bazaar RCS which, in turn, was
a user-friendly reimplementation of GNU Arch.


%prep
%setup -q
%patch0 -p1

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc HACKING NEWS README NEWS.developers TODO doc/
%{_bindir}/bzr
%{_mandir}/man1/*

%dir %{python_sitelib}/bzrlib
%{python_sitelib}/bzrlib/*.py
%{python_sitelib}/bzrlib/*.pyc
%ghost %{python_sitelib}/bzrlib/*.pyo

%dir %{python_sitelib}/bzrlib/export
%{python_sitelib}/bzrlib/export/*.py
%{python_sitelib}/bzrlib/export/*.pyc
%ghost %{python_sitelib}/bzrlib/export/*.pyo

%dir %{python_sitelib}/bzrlib/plugins
%{python_sitelib}/bzrlib/plugins/*.py
%{python_sitelib}/bzrlib/plugins/*.pyc
%ghost %{python_sitelib}/bzrlib/plugins/*.pyo

%dir %{python_sitelib}/bzrlib/util
%{python_sitelib}/bzrlib/util/*.py
%{python_sitelib}/bzrlib/util/*.pyc
%ghost %{python_sitelib}/bzrlib/util/*.pyo

%dir %{python_sitelib}/bzrlib/util/configobj
%{python_sitelib}/bzrlib/util/configobj/*.py
%{python_sitelib}/bzrlib/util/configobj/*.pyc
%ghost %{python_sitelib}/bzrlib/util/configobj/*.pyo

%dir %{python_sitelib}/bzrlib/transport
%{python_sitelib}/bzrlib/transport/*.py
%{python_sitelib}/bzrlib/transport/*.pyc
%ghost %{python_sitelib}/bzrlib/transport/*.pyo

%dir %{python_sitelib}/bzrlib/store
%{python_sitelib}/bzrlib/store/*.py
%{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/ui
%{python_sitelib}/bzrlib/ui/*.py
%{python_sitelib}/bzrlib/ui/*.pyc
%ghost %{python_sitelib}/bzrlib/ui/*.pyo

%dir %{python_sitelib}/bzrlib/util/effbot/org
%{python_sitelib}/bzrlib/util/effbot/org/*.py
%{python_sitelib}/bzrlib/util/effbot/org/*.pyc
%ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo

%changelog
* Fri Feb 10 2006 Shahms E. King  0.7-1
- Update to 0.7

* Thu Jan 26 2006 Shahms E. King  0.6.2-2
- Fix system library patch

* Wed Dec 07 2005 Shahms E. King  0.6.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Feb 2006 18:59:51 -0000	1.1
+++ .cvsignore	10 Feb 2006 19:00:25 -0000	1.2
@@ -0,0 +1 @@
+bzr-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Feb 2006 18:59:51 -0000	1.1
+++ sources	10 Feb 2006 19:00:25 -0000	1.2
@@ -0,0 +1 @@
+5daf99b67478027ed0914edf32997181  bzr-0.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Feb 10 19:04:20 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 10 Feb 2006 14:04:20 -0500
Subject: owners owners.list,1.627,1.628
Message-ID: <200602101904.k1AJ4qB3013655@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	owners.list 
Log Message:
Add bzr



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- owners.list	9 Feb 2006 19:18:48 -0000	1.627
+++ owners.list	10 Feb 2006 19:04:20 -0000	1.628
@@ -92,6 +92,7 @@
 Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|byzanz|A desktop recorder|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|bzr|A friendly distributed version control system|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Feb 10 19:34:50 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 10 Feb 2006 14:34:50 -0500
Subject: owners owners.list,1.628,1.629
Message-ID: <200602101935.k1AJZMmx014140@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	owners.list 
Log Message:
evas


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.628
retrieving revision 1.629
diff -u -r1.628 -r1.629
--- owners.list	10 Feb 2006 19:04:20 -0000	1.628
+++ owners.list	10 Feb 2006 19:34:50 -0000	1.629
@@ -202,6 +202,7 @@
 Fedora Extras|epylog|New logs analyzer and parser|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|evas|A hardware-accelerated canvas API|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Feb 10 19:40:42 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 14:40:42 -0500
Subject: rpms/drgeo/devel drgeo.spec,1.3,1.4
Message-ID: <200602101941.k1AJfEqS014238@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	drgeo.spec 
Log Message:
update to 1.1.0-5


Index: drgeo.spec
===================================================================
RCS file: /cvs/extras/rpms/drgeo/devel/drgeo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- drgeo.spec	3 Nov 2005 18:14:24 -0000	1.3
+++ drgeo.spec	10 Feb 2006 19:40:41 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Interactive educational geometry software
 Name: drgeo
 Version: 1.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.ofset.org/drgeo
@@ -61,6 +61,9 @@
 %{_datadir}/applications/fedora-drgeo.desktop
 
 %changelog
+* Fri Feb 10 2006 Eric Tanguy  - 1.1.0-5
+- Rebuild for FC5
+
 * Sun Oct 23 2005 Eric Tanguy  - 1.1.0-4
 - Modify the default doc reader to htmlview
 



From fedora-extras-commits at redhat.com  Fri Feb 10 19:48:31 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 14:48:31 -0500
Subject: rpms/drgeo import.log,1.8,1.9
Message-ID: <200602101949.k1AJn3ia014394@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import drgeo-1.1.0-6 on branch devel from drgeo-1.1.0-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/drgeo/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	3 Nov 2005 18:20:21 -0000	1.8
+++ import.log	10 Feb 2006 19:48:31 -0000	1.9
@@ -5,3 +5,4 @@
 drgeo-1_1_0-4:HEAD:drgeo-1.1.0-4.src.rpm:1131041650
 drgeo-1_1_0-4:FC-3:drgeo-1.1.0-4.src.rpm:1131041937
 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



From fedora-extras-commits at redhat.com  Fri Feb 10 19:48:37 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 14:48:37 -0500
Subject: rpms/drgeo/devel drgeo.spec,1.4,1.5
Message-ID: <200602101949.k1AJn9dp014397@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	drgeo.spec 
Log Message:
auto-import drgeo-1.1.0-6 on branch devel from drgeo-1.1.0-6.src.rpm


Index: drgeo.spec
===================================================================
RCS file: /cvs/extras/rpms/drgeo/devel/drgeo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- drgeo.spec	10 Feb 2006 19:40:41 -0000	1.4
+++ drgeo.spec	10 Feb 2006 19:48:37 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Interactive educational geometry software
 Name: drgeo
 Version: 1.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.ofset.org/drgeo
@@ -61,6 +61,9 @@
 %{_datadir}/applications/fedora-drgeo.desktop
 
 %changelog
+* Fri Feb 10 2006 Eric Tanguy  - 1.1.0-6
+- Rebuild for FC5
+
 * Fri Feb 10 2006 Eric Tanguy  - 1.1.0-5
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Fri Feb 10 20:23:30 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 10 Feb 2006 15:23:30 -0500
Subject: fedora-security/audit fc4,1.150,1.151 fc5,1.59,1.60
Message-ID: <200602102023.k1AKNUC3016457@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	fc4 fc5 
Log Message:
Note the gnutls issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- fc4	10 Feb 2006 03:30:42 -0000	1.150
+++ fc4	10 Feb 2006 20:23:22 -0000	1.151
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-0645 VULNERABLE (gnutls)
 CVE-2006-0591 VULNERABLE (postgresql)
 CVE-2006-0576 VULNERABLE (oprofile)
 CVE-2006-0528 **evolution


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- fc5	10 Feb 2006 03:30:42 -0000	1.59
+++ fc5	10 Feb 2006 20:23:22 -0000	1.60
@@ -15,6 +15,7 @@
 
 ** are items that need attention
 
+CVE-2006-0645 VULNERABLE (gnutls)
 CVE-2006-0591 VULNERABLE (postgresql)
 CVE-2006-0576 VULNERABLE (oprofile)
 CVE-2006-0528 ** evolution [under investigation]



From fedora-extras-commits at redhat.com  Fri Feb 10 21:38:41 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:38:41 -0500
Subject: rpms/drgeo-doc import.log,1.2,1.3
Message-ID: <200602102139.k1ALdDCf018532@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/drgeo-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18500

Modified Files:
	import.log 
Log Message:
auto-import drgeo-doc-1.6-6 on branch devel from drgeo-doc-1.6-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/drgeo-doc/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	2 Nov 2005 21:33:21 -0000	1.2
+++ import.log	10 Feb 2006 21:38:40 -0000	1.3
@@ -1 +1,2 @@
 drgeo-doc-1_6-5:HEAD:drgeo-doc-1.6-5.src.rpm:1130967155
+drgeo-doc-1_6-6:HEAD:drgeo-doc-1.6-6.src.rpm:1139607510



From fedora-extras-commits at redhat.com  Fri Feb 10 21:38:47 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:38:47 -0500
Subject: rpms/drgeo-doc/devel drgeo-doc.spec,1.1,1.2
Message-ID: <200602102139.k1ALdKOh018535@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/drgeo-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18500/devel

Modified Files:
	drgeo-doc.spec 
Log Message:
auto-import drgeo-doc-1.6-6 on branch devel from drgeo-doc-1.6-6.src.rpm


Index: drgeo-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/drgeo-doc/devel/drgeo-doc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drgeo-doc.spec	2 Nov 2005 21:33:27 -0000	1.1
+++ drgeo-doc.spec	10 Feb 2006 21:38:47 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Html documentation for drgeo
 Name: drgeo-doc
 Version: 1.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.ofset.org/drgeo
@@ -38,6 +38,9 @@
 %{_datadir}/drgeo/help
 
 %changelog
+* Fri Feb 10 2006 Eric Tanguy  - 1.6-6
+- Rebuild for FC5
+
 * Wed Nov 02 2005 Eric Tanguy  - 1.6-5
 - Own of %{_datadir}/drgeo/help
 



From fedora-extras-commits at redhat.com  Fri Feb 10 21:40:09 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:40:09 -0500
Subject: rpms/gperiodic import.log,1.2,1.3
Message-ID: <200602102140.k1ALefGd018631@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Oct 2005 21:49:03 -0000	1.2
+++ import.log	10 Feb 2006 21:40:09 -0000	1.3
@@ -1 +1,2 @@
 gperiodic-2_0_8-2:HEAD:gperiodic-2.0.8-2.src.rpm:1130708935
+gperiodic-2_0_8-3:HEAD:gperiodic-2.0.8-3.src.rpm:1139607599



From fedora-extras-commits at redhat.com  Fri Feb 10 21:40:15 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:40:15 -0500
Subject: rpms/gperiodic/devel gperiodic.spec,1.1,1.2
Message-ID: <200602102140.k1ALelTH018634@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	gperiodic.spec 
Log Message:
auto-import gperiodic-2.0.8-3 on branch devel from gperiodic-2.0.8-3.src.rpm


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gperiodic.spec	30 Oct 2005 21:49:09 -0000	1.1
+++ gperiodic.spec	10 Feb 2006 21:40:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://koti.welho.com/jfrantz/software/gperiodic.html
@@ -58,6 +58,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Fri Feb 10 2006 Eric Tanguy  - 2.0.8-3
+- Rebuild for FC5
+
 * Mon Oct 24 2005 Eric Tanguy  - 2.0.8-2
 - Applied patch file : 
 https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=120301



From fedora-extras-commits at redhat.com  Fri Feb 10 21:41:36 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:41:36 -0500
Subject: rpms/ircd-hybrid import.log,1.18,1.19
Message-ID: <200602102142.k1ALg9IU018721@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18689

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-5 on branch devel from ircd-hybrid-7.2.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- import.log	12 Dec 2005 15:16:30 -0000	1.18
+++ import.log	10 Feb 2006 21:41:36 -0000	1.19
@@ -15,3 +15,4 @@
 ircd-hybrid-7_2_0-4:HEAD:ircd-hybrid-7.2.0-4.src.rpm:1134400398
 ircd-hybrid-7_2_0-4:FC-4:ircd-hybrid-7.2.0-4.src.rpm:1134400497
 ircd-hybrid-7_2_0-4:FC-3:ircd-hybrid-7.2.0-4.src.rpm:1134400580
+ircd-hybrid-7_2_0-5:HEAD:ircd-hybrid-7.2.0-5.src.rpm:1139607686



From fedora-extras-commits at redhat.com  Fri Feb 10 21:41:42 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:41:42 -0500
Subject: rpms/ircd-hybrid/devel ircd-hybrid.spec,1.7,1.8
Message-ID: <200602102142.k1ALgE3E018724@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18689/devel

Modified Files:
	ircd-hybrid.spec 
Log Message:
auto-import ircd-hybrid-7.2.0-5 on branch devel from ircd-hybrid-7.2.0-5.src.rpm


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ircd-hybrid.spec	12 Dec 2005 15:13:34 -0000	1.7
+++ ircd-hybrid.spec	10 Feb 2006 21:41:42 -0000	1.8
@@ -10,7 +10,7 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Eric Tanguy  - 7.2.0-5
+- Rebuild for FC5
+
 * Fri Dec 09 2005 Eric Tanguy 7.2.0-4
 - Modify spec file to help files
 



From fedora-extras-commits at redhat.com  Fri Feb 10 21:43:02 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:43:02 -0500
Subject: rpms/libupnp import.log,1.2,1.3
Message-ID: <200602102143.k1ALhY06018811@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import libupnp-1.2.1a-5 on branch devel from libupnp-1.2.1a-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libupnp/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	20 Jan 2006 08:40:05 -0000	1.2
+++ import.log	10 Feb 2006 21:43:02 -0000	1.3
@@ -1 +1,2 @@
 libupnp-1_2_1a-4:HEAD:libupnp-1.2.1a-4.src.rpm:1137746395
+libupnp-1_2_1a-5:HEAD:libupnp-1.2.1a-5.src.rpm:1139607771



From fedora-extras-commits at redhat.com  Fri Feb 10 21:43:08 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:43:08 -0500
Subject: rpms/libupnp/devel libupnp.spec,1.1,1.2
Message-ID: <200602102143.k1ALheuZ018814@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	libupnp.spec 
Log Message:
auto-import libupnp-1.2.1a-5 on branch devel from libupnp-1.2.1a-5.src.rpm


Index: libupnp.spec
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/libupnp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libupnp.spec	20 Jan 2006 08:40:11 -0000	1.1
+++ libupnp.spec	10 Feb 2006 21:43:08 -0000	1.2
@@ -1,7 +1,7 @@
 Version: 1.2.1a
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Libraries
 URL: http://upnp.sourceforge.net/
@@ -83,6 +83,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Fri Feb 10 2006 Eric Tanguy  - 1.2.1a-5
+- Rebuild for FC5
+
 * Mon Jan  9 2006 Eric Tanguy 1.2.1a-4
 - Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1
 



From fedora-extras-commits at redhat.com  Fri Feb 10 21:44:28 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:44:28 -0500
Subject: rpms/ushare import.log,1.2,1.3
Message-ID: <200602102145.k1ALj0wR018903@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import ushare-0.9.5-5 on branch devel from ushare-0.9.5-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ushare/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	26 Jan 2006 17:03:57 -0000	1.2
+++ import.log	10 Feb 2006 21:44:28 -0000	1.3
@@ -1 +1,2 @@
 ushare-0_9_5-4:HEAD:ushare-0.9.5-4.src.rpm:1138295015
+ushare-0_9_5-5:HEAD:ushare-0.9.5-5.src.rpm:1139607858



From fedora-extras-commits at redhat.com  Fri Feb 10 21:44:34 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Feb 2006 16:44:34 -0500
Subject: rpms/ushare/devel ushare.spec,1.1,1.2
Message-ID: <200602102145.k1ALj6NT018906@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	ushare.spec 
Log Message:
auto-import ushare-0.9.5-5 on branch devel from ushare-0.9.5-5.src.rpm


Index: ushare.spec
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ushare.spec	26 Jan 2006 17:04:03 -0000	1.1
+++ ushare.spec	10 Feb 2006 21:44:34 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: UPnP (TM) A/V Media Server
 Name: ushare
 Version: 0.9.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://ushare.geexbox.org/
@@ -70,6 +70,9 @@
 %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/
 
 %changelog
+* Fri Feb 10 2006 Eric Tanguy  - 0.9.5-5
+- Rebuild for FC5
+
 * Tue Dec 27 2005 Eric Tanguy 0.9.5-4
 - Use %find_lang macro instead of %{_datadir}/locale/*
 



From fedora-extras-commits at redhat.com  Fri Feb 10 22:30:49 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 10 Feb 2006 17:30:49 -0500
Subject: rpms/bazaar/devel bazaar-neon-escape.patch, NONE, 1.1 bazaar.spec, 
	1.11, 1.12
Message-ID: <200602102231.k1AMVLE9021249@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	bazaar.spec 
Added Files:
	bazaar-neon-escape.patch 
Log Message:
Add a patch to work around libneon changes


bazaar-neon-escape.patch:

--- NEW FILE bazaar-neon-escape.patch ---
--- thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c.orig	2006-02-10 13:35:55.000000000 -0800
+++ thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c	2006-02-10 13:34:10.000000000 -0800
@@ -520,6 +520,44 @@
     parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));
 }
 
+/* RFC2396 spake:
+ * "Data must be escaped if it does not have a representation 
+ * using an unreserved character".
+ */
+
+/* Lookup table: character classes from 2396. (This is overkill) */
+
+#define SP 0   /* space    =                  */
+#define CO 0   /* control  =       */
+#define DE 0   /* delims   = "<" | ">" | "#" | "%" | <">                               */
+#define UW 0   /* unwise   = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`"             */
+#define MA 1   /* mark     = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"       */
+#define AN 2   /* alphanum = alpha | digit                                             */
+#define RE 2   /* reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," */
+
+static const char uri_chars[128] = {
+/*                +2      +4      +6      +8     +10     +12     +14     */
+/*   0 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO,
+/*  16 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO,
+/*  32 */ SP, MA, DE, DE, RE, DE, RE, MA, MA, MA, MA, RE, RE, MA, MA, RE,
+/*  48 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, RE, RE, DE, RE, DE, RE,
+/*  64 */ RE, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN,
+/*  80 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, UW, MA,
+/*  96 */ UW, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN,
+/* 112 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, MA, CO 
+};
+
+#define ESCAPE(ch) (((const signed char)(ch) < 0 || \
+		uri_chars[(unsigned int)(ch)] == 0))
+
+#undef SP
+#undef CO
+#undef DE
+#undef UW
+#undef MA
+#undef AN
+#undef RE
+
 /**
  * \brief escape a location
  *
@@ -528,9 +566,36 @@
 t_uchar *
 escape_location (t_uchar const *location)
 {
-    return ne_path_escape(location);
+    const char *pnt;
+    char *ret, *retpos;
+    int count = 0;
+    for (pnt = location; *pnt != '\0'; pnt++) {
+	if (ESCAPE(*pnt)) {
+	    count++;
+	}
+    }
+    if (count == 0) {
+	return ne_strdup(location);
+    }
+    /* An escaped character is "%xx", i.e., two MORE
+     * characters than the original string */
+    retpos = ret = ne_malloc(strlen(location) + 2*count + 1);
+    for (pnt = location; *pnt != '\0'; pnt++) {
+	if (ESCAPE(*pnt)) {
+	    /* Escape it - % */
+	    sprintf(retpos, "%%%02x", (unsigned char) *pnt);
+	    retpos += 3;
+	} else {
+	    /* It's cool */
+	    *retpos++ = *pnt;
+	}
+    }
+    *retpos = '\0';
+    return ret;
 }
 
+#undef ESCAPE
+
 /**
  * \brief unescape a location
  *
@@ -539,7 +604,25 @@
 t_uchar *
 unescape_location (t_uchar const *location)
 {
-    return ne_path_unescape(location);
+    const char *pnt;
+    char *ret, *retpos, buf[5] = { "0x00\0" };
+    retpos = ret = ne_malloc(strlen(location) + 1);
+    for (pnt = location; *pnt != '\0'; pnt++) {
+	if (*pnt == '%') {
+	    if (!isxdigit((unsigned char) pnt[1]) || 
+		!isxdigit((unsigned char) pnt[2])) {
+		/* Invalid URI */
+                free(ret);
+		return NULL;
+	    }
+	    buf[2] = *++pnt; buf[3] = *++pnt; /* bit faster than memcpy */
+	    *retpos++ = (char)strtol(buf, NULL, 16);
+	} else {
+	    *retpos++ = *pnt;
+	}
+    }
+    *retpos = '\0';
+    return ret;
 }
 
 /* tag: Tom Lord Thu Jun  5 15:12:22 2003 (pfs.c)


Index: bazaar.spec
===================================================================
RCS file: /cvs/extras/rpms/bazaar/devel/bazaar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bazaar.spec	1 Feb 2006 17:13:21 -0000	1.11
+++ bazaar.spec	10 Feb 2006 22:30:48 -0000	1.12
@@ -1,11 +1,12 @@
 Name:       bazaar
 Version:    1.4.2
 Summary:    A distributed revision control system
-Release:    4%{?dist}
+Release:    5%{?dist}
 License:    GPL
 Group:      Development/Tools
 Source:     http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz
 Source1:    http://bazaar.canonical.com/releases/src/bazaar-doc_1.4.tar.gz
+Patch0:     bazaar-neon-escape.patch
 URL:        http://bazaar.canonical.com/
 
 BuildRequires: neon-devel which gettext gpgme-devel python-docutils tetex-latex
@@ -25,6 +26,7 @@
 %prep
 # unpack the source
 %setup -q -n thelove at canonical.com---dists--bazaar--1.4
+%patch0 -p1
 # unpack the documentation
 %setup -q -n thelove at canonical.com---dists--bazaar--1.4 -D -T -a 1
 
@@ -82,6 +84,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Shahms E. King  1.4.2-5
+- Fix for changes in ne_path_escape
+
 * Wed Feb 01 2006 Shahms E. King  1.4.2-4
 - Rebuild against new neon
 



From fedora-extras-commits at redhat.com  Sat Feb 11 04:57:00 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 10 Feb 2006 23:57:00 -0500
Subject: rpms/perl-libintl/devel perl-libintl.spec,1.3,1.4
Message-ID: <200602110457.k1B4vXsT000763@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	perl-libintl.spec 
Log Message:
- Rework spec (PR 180767).



Index: perl-libintl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-libintl/devel/perl-libintl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-libintl.spec	9 Feb 2006 16:52:49 -0000	1.3
+++ perl-libintl.spec	11 Feb 2006 04:56:59 -0000	1.4
@@ -1,20 +1,16 @@
-%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
-%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
-%define real_name libintl-perl
-
 Summary: Internationalization library for Perl, compatible with gettext
 Name: perl-libintl
 Version: 1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
-Group: Applications/CPAN
+Group: Development/Libraries
 URL: http://search.cpan.org/dist/libintl-perl/
 Source: http://search.cpan.org/CPAN/authors/id/G/GU/GUIDO/libintl-perl-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: perl-libintl-perl = %{version}-%{release}
-Provides: perl(Locale::gettext_xs)
-BuildArch: noarch
+
+BuildRequires:	gdbm-devel db4-devel
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 The package libintl-perl is an internationalization library for Perl that
@@ -23,37 +19,44 @@
 
 
 %prep
-%setup -n libintl-perl-%{version}
-
+%setup -q -n libintl-perl-%{version}
+find -type f -exec chmod -x {} \;
+find lib/Locale gettext_xs \( -name '*.pm' -o -name '*.pod' \) \
+  -exec sed -i -e '/^#! \/bin\/false/d' {} \;
 
 %build
-%{__perl} Makefile.PL \
-    PREFIX="%{buildroot}%{_prefix}" \
-    INSTALLDIRS="vendor"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 %{__make} %{?_smp_mflags}
 
 
 %install
-%{__rm} -rf %{buildroot}
-%makeinstall
+%{__rm} -rf $RPM_BUILD_ROOT
+make 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/*
 
-### Clean up buildroot
-%{__rm} -rf %{buildroot}%{perl_archlib} \
-            %{buildroot}%{perl_vendorarch}
+%check
+make test
 
 
 %clean
-%{__rm} -rf %{buildroot}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-, root, root, 0755)
 %doc ChangeLog COPYING* NEWS README THANKS TODO
-%{perl_vendorlib}/Locale/
+%{perl_vendorlib}/Locale
+%{perl_vendorarch}/auto/Locale
 %{_mandir}/man?/*
 
 
 %changelog
+* Sat Feb 11 2006 Ralf Cors??pius   1.16-2
+- Rework spec (PR 180767).
+
 * Thu Feb  9 2006 Matthias Saou  1.16-1
 - Update to 1.16.
 
@@ -65,4 +68,3 @@
 
 * Thu Nov  4 2004 Matthias Saou  1.11-1
 - Initial RPM release.
-



From fedora-extras-commits at redhat.com  Sat Feb 11 09:32:26 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 11 Feb 2006 04:32:26 -0500
Subject: rpms/freehdl - New directory
Message-ID: <200602110932.k1B9WTWY010931@cvs-int.fedora.redhat.com>

Author: tanguy

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

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




From fedora-extras-commits at redhat.com  Sat Feb 11 09:32:32 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 11 Feb 2006 04:32:32 -0500
Subject: rpms/freehdl/devel - New directory
Message-ID: <200602110932.k1B9WYv1010946@cvs-int.fedora.redhat.com>

Author: tanguy

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

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




From fedora-extras-commits at redhat.com  Sat Feb 11 09:32:57 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 11 Feb 2006 04:32:57 -0500
Subject: rpms/freehdl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602110932.k1B9WxG0011016@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 11 09:33:03 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 11 Feb 2006 04:33:03 -0500
Subject: rpms/freehdl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200602110933.k1B9X5FB011036@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


--- NEW 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 Feb 11 09:35:01 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 11 Feb 2006 04:35:01 -0500
Subject: rpms/freehdl import.log,1.1,1.2
Message-ID: <200602110935.k1B9ZYp9011105@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freehdl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Feb 2006 09:32:57 -0000	1.1
+++ import.log	11 Feb 2006 09:35:01 -0000	1.2
@@ -0,0 +1 @@
+freehdl-0_0_1-1:HEAD:freehdl-0.0.1-1.src.rpm:1139650493



From fedora-extras-commits at redhat.com  Sat Feb 11 09:35:07 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 11 Feb 2006 04:35:07 -0500
Subject: rpms/freehdl/devel freehdl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200602110935.k1B9ZdHJ011109@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


--- NEW FILE freehdl.spec ---
Summary: GPLed free VHDL
Name: freehdl
Version: 0.0.1
Release: 1%{?dist}
License: GPL
Group: Applications/Engineering
Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz
URL: http://www.freehdl.seul.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/install-info /sbin/ldconfig
Requires(preun): /sbin/install-info

%description
A project to develop a free, open source, GPL'ed VHDL simulator for Linux.

%prep
%setup -q

%build
%configure \
  --disable-dependancy-tracking \
  --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall

%post
/sbin/ldconfig
/sbin/install-info %{_infodir}/fire.info.gz %{_infodir}/dir || :

%postun -p /sbin/ldconfig

%preun
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/fire.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README*
%{_infodir}/fire*
%{_bindir}/*
%{_datadir}/freehdl
%{_libdir}/freehdl/
%{_libdir}/libfreehdl*
%{_includedir}/freehdl/
%{_mandir}/man1/*
%{_mandir}/man5/*

%changelog
* Mon Jan 23 2005 Eric Tanguy  0.0.1-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freehdl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Feb 2006 09:33:03 -0000	1.1
+++ .cvsignore	11 Feb 2006 09:35:07 -0000	1.2
@@ -0,0 +1 @@
+freehdl-0.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freehdl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Feb 2006 09:33:03 -0000	1.1
+++ sources	11 Feb 2006 09:35:07 -0000	1.2
@@ -0,0 +1 @@
+a88be93ac3eed4452cc64c86b4573013  freehdl-0.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Feb 11 09:38:54 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sat, 11 Feb 2006 04:38:54 -0500
Subject: owners owners.list,1.629,1.630
Message-ID: <200602110939.k1B9dRWI011163@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -r1.629 -r1.630
--- owners.list	10 Feb 2006 19:34:50 -0000	1.629
+++ owners.list	11 Feb 2006 09:38:54 -0000	1.630
@@ -244,6 +244,7 @@
 Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|freehdl|A project to develop a free, open source, GPL'ed VHDL simulator for Linux|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|FreeWnn|Japanese input server|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|freeze|freeze/melt/fcat compression utilities|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Feb 11 09:57:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Feb 2006 04:57:44 -0500
Subject: rpms/bash-completion/FC-4 bash-completion.profile, 1.2,
	1.3 bash-completion.spec, 1.11, 1.12
Message-ID: <200602110958.k1B9wHjV011268@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	bash-completion.profile bash-completion.spec 
Log Message:
* Wed Feb  8 2006 Ville Skytt??  - 20050721-4
- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.

* Sat Feb  4 2006 Ville Skytt?? 
- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).

* Sun Jan  8 2006 Ville Skytt??  - 20050721-3
- Patch to hopefully fix quoting problems with bash 3.1 (#177056).

* Mon Nov 28 2005 Ville Skytt??  - 20050721-2
- Work around potential login problem in profile.d snippet (#174355).

* Sat Nov 26 2005 Ville Skytt?? 
- Don't mark the main source file as %%config.
- Make profile.d snippet non-executable (#35714) and noreplace.
- Add mock, plague-client and repomanage completion.
- Allow "cvs stat" completion.
- Macroize trigger creation.



Index: bash-completion.profile
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.profile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion.profile	27 Nov 2004 15:44:30 -0000	1.2
+++ bash-completion.profile	11 Feb 2006 09:57:44 -0000	1.3
@@ -1,5 +1,8 @@
-# check for bash
-[ -z "$BASH_VERSION" ] && return
+# check for bash (and that we haven't already been sourced, see eg. #174355)
+[ -z "$BASH_VERSION" -o -n "$BASH_COMPLETION" ] && return
+
+# skip non-interactive shells
+[[ $- == *i* ]] || return
 
 # check for correct version of bash
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bash-completion.spec	22 Jul 2005 06:51:53 -0000	1.11
+++ bash-completion.spec	11 Feb 2006 09:57:44 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050721
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -8,6 +8,12 @@
 URL:            http://www.caliban.org/bash/
 Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 Source1:        %{name}.profile
+Source2:        %{name}-mock
+Source3:        %{name}-repomanage
+Source4:        %{name}-plague-client
+Patch0:         %{name}-20050721-cvs-stat.patch
+Patch1:         %{name}-20050721-bash31quoting.patch
+Patch2:         %{name}-20050721-mtr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -20,6 +26,12 @@
 
 %prep
 %setup -q -n bash_completion
+%patch0
+%patch1 -p1
+%patch2
+install -pm 644 %{SOURCE2} contrib/mock
+install -pm 644 %{SOURCE3} contrib/plague-client
+install -pm 644 %{SOURCE3} contrib/repomanage
 
 
 %build
@@ -46,87 +58,66 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%triggerin -- bittorrent
-if [ ! -e %{_sysconfdir}/bash_completion.d/bittorrent ] ; then
-  ln -s %{_datadir}/%{name}/bittorrent %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- bittorrent
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/bittorrent
-
-%triggerin -- cksfv
-if [ ! -e %{_sysconfdir}/bash_completion.d/cksfv ] ; then
-  ln -s %{_datadir}/%{name}/cksfv %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- cksfv
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/cksfv
-
-%triggerin -- freeciv
-if [ ! -e %{_sysconfdir}/bash_completion.d/freeciv ] ; then
-  ln -s %{_datadir}/%{name}/freeciv %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- freeciv
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/freeciv
-
-%triggerin -- gkrellm
-if [ ! -e %{_sysconfdir}/bash_completion.d/gkrellm ] ; then
-  ln -s %{_datadir}/%{name}/gkrellm %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- gkrellm
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gkrellm
-
-%triggerin -- mailman
-if [ ! -e %{_sysconfdir}/bash_completion.d/mailman ] ; then
-  ln -s %{_datadir}/%{name}/mailman %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mailman
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mailman
-
-%triggerin -- mcrypt
-if [ ! -e %{_sysconfdir}/bash_completion.d/mcrypt ] ; then
-  ln -s %{_datadir}/%{name}/mcrypt %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mcrypt
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mcrypt
-
-%triggerin -- mtx
-if [ ! -e %{_sysconfdir}/bash_completion.d/mtx ] ; then
-  ln -s %{_datadir}/%{name}/mtx %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mtx
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mtx
-
-%triggerin -- subversion
-if [ ! -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
-  ln -s %{_datadir}/%{name}/subversion %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- subversion
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/subversion
-
-%triggerin -- unace
-if [ ! -e %{_sysconfdir}/bash_completion.d/unace ] ; then
-  ln -s %{_datadir}/%{name}/unace %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- unace
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unace
-
-%triggerin -- unrar
-if [ ! -e %{_sysconfdir}/bash_completion.d/unrar ] ; then
-  ln -s %{_datadir}/%{name}/unrar %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- unrar
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unrar
+%define bashcomp_trigger() \
+%triggerin -- %1\
+if [ ! -e %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1} ] ; then\
+  ln -s %{_datadir}/%{name}/%{?2}%{!?2:%1} %{_sysconfdir}/bash_completion.d\
+fi\
+%triggerun -- %1\
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1}\
+%{nil}
+
+%bashcomp_trigger bittorrent
+%bashcomp_trigger cksfv
+%bashcomp_trigger clisp
+%bashcomp_trigger freeciv
+%bashcomp_trigger gcc-gnat gnatmake
+%bashcomp_trigger gkrellm
+%bashcomp_trigger mailman
+%bashcomp_trigger mcrypt
+%bashcomp_trigger mock
+%bashcomp_trigger mtx
+%bashcomp_trigger plague-client
+%bashcomp_trigger ruby-ri ri
+%bashcomp_trigger sbcl
+%bashcomp_trigger snownews
+%bashcomp_trigger subversion
+%bashcomp_trigger unace
+%bashcomp_trigger unixODBC isql
+%bashcomp_trigger unrar
+%bashcomp_trigger yum-utils repomanage
 
 
 %files -f %{name}-ghosts.list
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc BUGS Changelog COPYING README
-%config %{_sysconfdir}/bash_completion
-%attr(0755,root,root) %config %{_sysconfdir}/profile.d/*
-%{_datadir}/%{name}
-%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
+%{_sysconfdir}/bash_completion
+%dir %{_sysconfdir}/bash_completion.d/
+%{_datadir}/%{name}/
 
 
 %changelog
+* Wed Feb  8 2006 Ville Skytt??  - 20050721-4
+- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
+- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.
+
+* Sat Feb  4 2006 Ville Skytt?? 
+- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).
+
+* Sun Jan  8 2006 Ville Skytt??  - 20050721-3
+- Patch to hopefully fix quoting problems with bash 3.1 (#177056).
+
+* Mon Nov 28 2005 Ville Skytt??  - 20050721-2
+- Work around potential login problem in profile.d snippet (#174355).
+
+* Sat Nov 26 2005 Ville Skytt?? 
+- Don't mark the main source file as %%config.
+- Make profile.d snippet non-executable (#35714) and noreplace.
+- Add mock, plague-client and repomanage completion.
+- Allow "cvs stat" completion.
+- Macroize trigger creation.
+
 * Fri Jul 22 2005 Ville Skytt??  - 20050721-1
 - 20050721.
 



From fedora-extras-commits at redhat.com  Sat Feb 11 10:03:42 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Feb 2006 05:03:42 -0500
Subject: rpms/bash-completion/FC-4
	bash-completion-20050721-bash31quoting.patch, NONE,
	1.1 bash-completion-20050721-cvs-stat.patch, NONE,
	1.1 bash-completion-20050721-mtr.patch, NONE,
	1.1 bash-completion-mock, NONE,
	1.1 bash-completion-plague-client, NONE,
	1.1 bash-completion-repomanage, NONE, 1.1
Message-ID: <200602111003.k1BA3i4V013114@cvs-int.fedora.redhat.com>

Author: scop

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

Added Files:
	bash-completion-20050721-bash31quoting.patch 
	bash-completion-20050721-cvs-stat.patch 
	bash-completion-20050721-mtr.patch bash-completion-mock 
	bash-completion-plague-client bash-completion-repomanage 
Log Message:
Add new sources and patches.

bash-completion-20050721-bash31quoting.patch:

--- NEW FILE bash-completion-20050721-bash31quoting.patch ---
--- bash_completion/bash_completion~	2005-07-21 22:21:22.000000000 +0300
+++ bash_completion/bash_completion	2006-01-08 17:31:57.000000000 +0200
@@ -661,4 +661,4 @@
 			COMPREPLY=( $( compgen -W "$( echo $( smbclient -d 0 -NL $host |
-			sed -ne '/^['$'\t '']*Sharename/,/^$/p' |
-			sed -ne '3,$s|^[^A-Za-z]*\([^'$'\t '']*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
+			sed -ne '/^[\t ]*Sharename/,/^$/p' |
+			sed -ne '3,$s|^[^A-Za-z]*\([^\t ]*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
 		fi
@@ -2398,5 +2398,5 @@
 	    # expand path (if present) to global known hosts file
-	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
+	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
 	    # expand path (if present) to user known hosts file
-	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
+	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
 	fi
@@ -2476,3 +2476,3 @@
 	    if [ ${#config[@]} -gt 0 ] && [ -n "$aliases" ]; then
-		hosts=$( compgen -W "$( sed -ne "s/^[Hh][Oo][Ss][Tt]["$'\t '"]*\([^*?]*\)$/\1/p" ${config[@]} )" -- $ocur )
+		hosts=$( compgen -W '$( sed -ne "s/^[Hh][Oo][Ss][Tt][\t ]*\([^*?]*\)$/\1/p" ${config[@]} )' -- $ocur )
 		COMPREPLY=( ${COMPREPLY[@]} $hosts )
@@ -5860,3 +5860,3 @@
 	dict $host $port $1 2>/dev/null | sed -ne \
-	    's/^['$'\t '']['$'\t '']*\([^'$'\t '']*\).*$/\1/p'
+	    's/^[\t ][\t ]*\([^\t ]*\).*$/\1/p'
 }
--- bash_completion/contrib/sitecopy~	2005-01-03 04:44:22.000000000 +0200
+++ bash_completion/contrib/sitecopy	2006-01-08 17:35:19.000000000 +0200
@@ -20,7 +20,7 @@
 		;;
 	    *)
 		if [ -r ~/.sitecopyrc ]; then
-		    COMPREPLY=( $( compgen -W "$(grep '^["$'\t '"]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
+		    COMPREPLY=( $( compgen -W "$(grep '^[\t ]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
 		fi
 		;;
 	esac

bash-completion-20050721-cvs-stat.patch:

--- NEW FILE bash-completion-20050721-cvs-stat.patch ---
--- bash_completion~	2005-07-21 22:21:22.000000000 +0300
+++ bash_completion	2005-09-21 17:25:01.000000000 +0300
@@ -1544,7 +1544,7 @@
 			@(rtag|rfreeze))
 				mode=rtag
 				;;
-			st?(atus))
+			st?(at?(us)))
 				mode=status
 				;;
 			@(tag|freeze))
@@ -1697,7 +1697,7 @@
 					   commit diff delete edit export \
 					   freeze get history import log new \
 					   patch rcs rdiff release remove \
-					   rfreeze rlog rm rtag status tag \
+					   rfreeze rlog rm rtag stat status tag \
 					   unedit up update -H -Q -q -b -d -e \
 					   -f -l -n -t -r -v -w -x -z --help \
 					   --version' -- $cur ) )

bash-completion-20050721-mtr.patch:

--- NEW FILE bash-completion-20050721-mtr.patch ---
--- bash_completion~	2005-07-21 22:21:22.000000000 +0300
+++ bash_completion	2006-02-04 21:05:17.000000000 +0200
@@ -2492,3 +2492,3 @@
 complete -F _known_hosts traceroute traceroute6 tracepath tracepath6 \
-	ping fping telnet host nslookup rsh rlogin ftp dig ssh-installkeys
+	ping fping telnet host nslookup rsh rlogin ftp dig ssh-installkeys mtr
 


--- NEW FILE bash-completion-mock ---
# bash completion for mock                                           -*- sh -*-

_mock()
{
    local cur prev

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}
    prev=${COMP_WORDS[COMP_CWORD-1]}

    case $prev in
        --@(result|state)dir)
            _filedir -d
            return 0
            ;;
        -r)
            COMPREPLY=( $( command ls /etc/mock | \
                sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
            return 0
            ;;
        -@(-arch|-uniqueext|-help|h))
            return 0
            ;;
    esac

    if [[ "$cur" == -* ]] ; then
        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean --arch \
            --debug --resultdir --statedir --uniqueext' -- $cur ) )
    else
        _filedir '?(no)src.rpm'
    fi
}
complete -F _mock $filenames mock


--- NEW FILE bash-completion-plague-client ---
# bash completion for plague-client                                  -*- sh -*-

_plague_client()
{
    local cur

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}

    [ $COMP_CWORD = 1 ] && \
    COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list \
        list_builders pause requeue unpause update_builders' -- $cur ) )

    return 0
}
complete -F _plague_client plague-client


--- NEW FILE bash-completion-repomanage ---
# bash completion for repomanage                                     -*- sh -*-

_repomanage()
{
    local cur prev

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}
    prev=${COMP_WORDS[COMP_CWORD-1]}

    case $prev in
        -@(h|-help|k|-keep))
            return 0
            ;;
    esac

    if [[ "$cur" == -* ]] ; then
        COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k --keep \
            -c --nocheck -h --help' -- $cur ) )
    else
        _filedir -d
    fi
}
complete -F _repomanage repomanage



From fedora-extras-commits at redhat.com  Sat Feb 11 10:06:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Feb 2006 05:06:00 -0500
Subject: rpms/bash-completion/FC-3
	bash-completion-20050721-bash31quoting.patch, NONE,
	1.1 bash-completion-20050721-cvs-stat.patch, NONE,
	1.1 bash-completion-20050721-mtr.patch, NONE,
	1.1 bash-completion-mock, NONE,
	1.1 bash-completion-plague-client, NONE,
	1.1 bash-completion-repomanage, NONE, 1.1 .cvsignore, 1.6,
	1.7 bash-completion.profile, 1.2, 1.3 bash-completion.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200602111006.k1BA6Wnn013171@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore bash-completion.profile bash-completion.spec 
	sources 
Added Files:
	bash-completion-20050721-bash31quoting.patch 
	bash-completion-20050721-cvs-stat.patch 
	bash-completion-20050721-mtr.patch bash-completion-mock 
	bash-completion-plague-client bash-completion-repomanage 
Log Message:
* Wed Feb  8 2006 Ville Skytt??  - 20050721-4
- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.

* Sat Feb  4 2006 Ville Skytt?? 
- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).

* Sun Jan  8 2006 Ville Skytt??  - 20050721-3
- Patch to hopefully fix quoting problems with bash 3.1 (#177056).

* Mon Nov 28 2005 Ville Skytt??  - 20050721-2
- Work around potential login problem in profile.d snippet (#174355).

* Sat Nov 26 2005 Ville Skytt?? 
- Don't mark the main source file as %%config.
- Make profile.d snippet non-executable (#35714) and noreplace.
- Add mock, plague-client and repomanage completion.
- Allow "cvs stat" completion.
- Macroize trigger creation.

* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
- 20050721.

* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
- 20050720, all patches applied upstream.

* Mon Jul 18 2005 Ville Skytt??  - 20050712-1
- 20050712.
- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).
- Add/fix support for some multimedia formats and players.
- Fix tarball completion.


bash-completion-20050721-bash31quoting.patch:

--- NEW FILE bash-completion-20050721-bash31quoting.patch ---
--- bash_completion/bash_completion~	2005-07-21 22:21:22.000000000 +0300
+++ bash_completion/bash_completion	2006-01-08 17:31:57.000000000 +0200
@@ -661,4 +661,4 @@
 			COMPREPLY=( $( compgen -W "$( echo $( smbclient -d 0 -NL $host |
-			sed -ne '/^['$'\t '']*Sharename/,/^$/p' |
-			sed -ne '3,$s|^[^A-Za-z]*\([^'$'\t '']*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
+			sed -ne '/^[\t ]*Sharename/,/^$/p' |
+			sed -ne '3,$s|^[^A-Za-z]*\([^\t ]*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
 		fi
@@ -2398,5 +2398,5 @@
 	    # expand path (if present) to global known hosts file
-	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
+	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
 	    # expand path (if present) to user known hosts file
-	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
+	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
 	fi
@@ -2476,3 +2476,3 @@
 	    if [ ${#config[@]} -gt 0 ] && [ -n "$aliases" ]; then
-		hosts=$( compgen -W "$( sed -ne "s/^[Hh][Oo][Ss][Tt]["$'\t '"]*\([^*?]*\)$/\1/p" ${config[@]} )" -- $ocur )
+		hosts=$( compgen -W '$( sed -ne "s/^[Hh][Oo][Ss][Tt][\t ]*\([^*?]*\)$/\1/p" ${config[@]} )' -- $ocur )
 		COMPREPLY=( ${COMPREPLY[@]} $hosts )
@@ -5860,3 +5860,3 @@
 	dict $host $port $1 2>/dev/null | sed -ne \
-	    's/^['$'\t '']['$'\t '']*\([^'$'\t '']*\).*$/\1/p'
+	    's/^[\t ][\t ]*\([^\t ]*\).*$/\1/p'
 }
--- bash_completion/contrib/sitecopy~	2005-01-03 04:44:22.000000000 +0200
+++ bash_completion/contrib/sitecopy	2006-01-08 17:35:19.000000000 +0200
@@ -20,7 +20,7 @@
 		;;
 	    *)
 		if [ -r ~/.sitecopyrc ]; then
-		    COMPREPLY=( $( compgen -W "$(grep '^["$'\t '"]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
+		    COMPREPLY=( $( compgen -W "$(grep '^[\t ]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
 		fi
 		;;
 	esac

bash-completion-20050721-cvs-stat.patch:

--- NEW FILE bash-completion-20050721-cvs-stat.patch ---
--- bash_completion~	2005-07-21 22:21:22.000000000 +0300
+++ bash_completion	2005-09-21 17:25:01.000000000 +0300
@@ -1544,7 +1544,7 @@
 			@(rtag|rfreeze))
 				mode=rtag
 				;;
-			st?(atus))
+			st?(at?(us)))
 				mode=status
 				;;
 			@(tag|freeze))
@@ -1697,7 +1697,7 @@
 					   commit diff delete edit export \
 					   freeze get history import log new \
 					   patch rcs rdiff release remove \
-					   rfreeze rlog rm rtag status tag \
+					   rfreeze rlog rm rtag stat status tag \
 					   unedit up update -H -Q -q -b -d -e \
 					   -f -l -n -t -r -v -w -x -z --help \
 					   --version' -- $cur ) )

bash-completion-20050721-mtr.patch:

--- NEW FILE bash-completion-20050721-mtr.patch ---
--- bash_completion~	2005-07-21 22:21:22.000000000 +0300
+++ bash_completion	2006-02-04 21:05:17.000000000 +0200
@@ -2492,3 +2492,3 @@
 complete -F _known_hosts traceroute traceroute6 tracepath tracepath6 \
-	ping fping telnet host nslookup rsh rlogin ftp dig ssh-installkeys
+	ping fping telnet host nslookup rsh rlogin ftp dig ssh-installkeys mtr
 


--- NEW FILE bash-completion-mock ---
# bash completion for mock                                           -*- sh -*-

_mock()
{
    local cur prev

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}
    prev=${COMP_WORDS[COMP_CWORD-1]}

    case $prev in
        --@(result|state)dir)
            _filedir -d
            return 0
            ;;
        -r)
            COMPREPLY=( $( command ls /etc/mock | \
                sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
            return 0
            ;;
        -@(-arch|-uniqueext|-help|h))
            return 0
            ;;
    esac

    if [[ "$cur" == -* ]] ; then
        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean --arch \
            --debug --resultdir --statedir --uniqueext' -- $cur ) )
    else
        _filedir '?(no)src.rpm'
    fi
}
complete -F _mock $filenames mock


--- NEW FILE bash-completion-plague-client ---
# bash completion for plague-client                                  -*- sh -*-

_plague_client()
{
    local cur

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}

    [ $COMP_CWORD = 1 ] && \
    COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list \
        list_builders pause requeue unpause update_builders' -- $cur ) )

    return 0
}
complete -F _plague_client plague-client


--- NEW FILE bash-completion-repomanage ---
# bash completion for repomanage                                     -*- sh -*-

_repomanage()
{
    local cur prev

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}
    prev=${COMP_WORDS[COMP_CWORD-1]}

    case $prev in
        -@(h|-help|k|-keep))
            return 0
            ;;
    esac

    if [[ "$cur" == -* ]] ; then
        COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k --keep \
            -c --nocheck -h --help' -- $cur ) )
    else
        _filedir -d
    fi
}
complete -F _repomanage repomanage


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Feb 2005 18:50:09 -0000	1.6
+++ .cvsignore	11 Feb 2006 10:05:58 -0000	1.7
@@ -1 +1 @@
-bash-completion-20050121.tar.bz2
+bash-completion-20050721.tar.bz2


Index: bash-completion.profile
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/bash-completion.profile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion.profile	27 Nov 2004 15:44:30 -0000	1.2
+++ bash-completion.profile	11 Feb 2006 10:05:59 -0000	1.3
@@ -1,5 +1,8 @@
-# check for bash
-[ -z "$BASH_VERSION" ] && return
+# check for bash (and that we haven't already been sourced, see eg. #174355)
+[ -z "$BASH_VERSION" -o -n "$BASH_COMPLETION" ] && return
+
+# skip non-interactive shells
+[[ $- == *i* ]] || return
 
 # check for correct version of bash
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/bash-completion.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bash-completion.spec	26 Feb 2005 18:50:09 -0000	1.6
+++ bash-completion.spec	11 Feb 2006 10:05:59 -0000	1.7
@@ -1,18 +1,23 @@
 Name:           bash-completion
-Version:        20050121
-Release:        1
-Epoch:          0
+Version:        20050721
+Release:        4%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPL
 URL:            http://www.caliban.org/bash/
-Source0:     http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2
+Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 Source1:        %{name}.profile
+Source2:        %{name}-mock
+Source3:        %{name}-repomanage
+Source4:        %{name}-plague-client
+Patch0:         %{name}-20050721-cvs-stat.patch
+Patch1:         %{name}-20050721-bash31quoting.patch
+Patch2:         %{name}-20050721-mtr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:       bash >= 0:2.05-12
+Requires:       bash >= 2.05-12
 
 %description
 bash-completion is a collection of shell functions that take advantage
@@ -21,6 +26,12 @@
 
 %prep
 %setup -q -n bash_completion
+%patch0
+%patch1 -p1
+%patch2
+install -pm 644 %{SOURCE2} contrib/mock
+install -pm 644 %{SOURCE3} contrib/plague-client
+install -pm 644 %{SOURCE3} contrib/repomanage
 
 
 %build
@@ -47,88 +58,79 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%triggerin -- bittorrent
-if [ ! -e %{_sysconfdir}/bash_completion.d/bittorrent ] ; then
-  ln -s %{_datadir}/%{name}/bittorrent %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- bittorrent
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/bittorrent
-
-%triggerin -- cksfv
-if [ ! -e %{_sysconfdir}/bash_completion.d/cksfv ] ; then
-  ln -s %{_datadir}/%{name}/cksfv %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- cksfv
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/cksfv
-
-%triggerin -- freeciv
-if [ ! -e %{_sysconfdir}/bash_completion.d/freeciv ] ; then
-  ln -s %{_datadir}/%{name}/freeciv %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- freeciv
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/freeciv
-
-%triggerin -- gkrellm
-if [ ! -e %{_sysconfdir}/bash_completion.d/gkrellm ] ; then
-  ln -s %{_datadir}/%{name}/gkrellm %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- gkrellm
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gkrellm
-
-%triggerin -- mailman
-if [ ! -e %{_sysconfdir}/bash_completion.d/mailman ] ; then
-  ln -s %{_datadir}/%{name}/mailman %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mailman
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mailman
-
-%triggerin -- mcrypt
-if [ ! -e %{_sysconfdir}/bash_completion.d/mcrypt ] ; then
-  ln -s %{_datadir}/%{name}/mcrypt %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mcrypt
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mcrypt
-
-%triggerin -- mtx
-if [ ! -e %{_sysconfdir}/bash_completion.d/mtx ] ; then
-  ln -s %{_datadir}/%{name}/mtx %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mtx
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mtx
-
-%triggerin -- subversion
-if [ ! -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
-  ln -s %{_datadir}/%{name}/subversion %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- subversion
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/subversion
-
-%triggerin -- unace
-if [ ! -e %{_sysconfdir}/bash_completion.d/unace ] ; then
-  ln -s %{_datadir}/%{name}/unace %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- unace
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unace
-
-%triggerin -- unrar
-if [ ! -e %{_sysconfdir}/bash_completion.d/unrar ] ; then
-  ln -s %{_datadir}/%{name}/unrar %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- unrar
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unrar
+%define bashcomp_trigger() \
+%triggerin -- %1\
+if [ ! -e %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1} ] ; then\
+  ln -s %{_datadir}/%{name}/%{?2}%{!?2:%1} %{_sysconfdir}/bash_completion.d\
+fi\
+%triggerun -- %1\
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1}\
+%{nil}
+
+%bashcomp_trigger bittorrent
+%bashcomp_trigger cksfv
+%bashcomp_trigger clisp
+%bashcomp_trigger freeciv
+%bashcomp_trigger gcc-gnat gnatmake
+%bashcomp_trigger gkrellm
+%bashcomp_trigger mailman
+%bashcomp_trigger mcrypt
+%bashcomp_trigger mock
+%bashcomp_trigger mtx
+%bashcomp_trigger plague-client
+%bashcomp_trigger ruby-ri ri
+%bashcomp_trigger sbcl
+%bashcomp_trigger snownews
+%bashcomp_trigger subversion
+%bashcomp_trigger unace
+%bashcomp_trigger unixODBC isql
+%bashcomp_trigger unrar
+%bashcomp_trigger yum-utils repomanage
 
 
 %files -f %{name}-ghosts.list
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc BUGS Changelog COPYING README
-%config %{_sysconfdir}/bash_completion
-%attr(0755,root,root) %config %{_sysconfdir}/profile.d/*
-%{_datadir}/%{name}
-%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
+%{_sysconfdir}/bash_completion
+%dir %{_sysconfdir}/bash_completion.d/
+%{_datadir}/%{name}/
 
 
 %changelog
-* Sat Jan 22 2005 Ville Skytt??  - 0:20050121-1
+* Wed Feb  8 2006 Ville Skytt??  - 20050721-4
+- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
+- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.
+
+* Sat Feb  4 2006 Ville Skytt?? 
+- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).
+
+* Sun Jan  8 2006 Ville Skytt??  - 20050721-3
+- Patch to hopefully fix quoting problems with bash 3.1 (#177056).
+
+* Mon Nov 28 2005 Ville Skytt??  - 20050721-2
+- Work around potential login problem in profile.d snippet (#174355).
+
+* Sat Nov 26 2005 Ville Skytt?? 
+- Don't mark the main source file as %%config.
+- Make profile.d snippet non-executable (#35714) and noreplace.
+- Add mock, plague-client and repomanage completion.
+- Allow "cvs stat" completion.
+- Macroize trigger creation.
+
+* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
+- 20050721.
+
+* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
+- 20050720, all patches applied upstream.
+
+* Mon Jul 18 2005 Ville Skytt??  - 20050712-1
+- 20050712.
+- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).
+- Add/fix support for some multimedia formats and players.
+- Fix tarball completion.
+
+* Sat Jan 22 2005 Ville Skytt??  - 0:20050121-2
 - Update to 20050121.
 
 * Thu Jan 13 2005 Ville Skytt??  - 0:20050112-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Feb 2005 18:50:09 -0000	1.6
+++ sources	11 Feb 2006 10:05:59 -0000	1.7
@@ -1 +1 @@
-fafeed562b01a8dee079eb851579f2d2  bash-completion-20050121.tar.bz2
+4de9f0dee0663f08b5e24f64490e642e  bash-completion-20050721.tar.bz2



From fedora-extras-commits at redhat.com  Sat Feb 11 10:18:56 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 05:18:56 -0500
Subject: rpms/ecore - New directory
Message-ID: <200602111018.k1BAIwKf013362@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Sat Feb 11 10:19:02 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 05:19:02 -0500
Subject: rpms/ecore/devel - New directory
Message-ID: <200602111019.k1BAJ49h013377@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Sat Feb 11 10:20:56 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 05:20:56 -0500
Subject: rpms/ecore Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602111020.k1BAKwXe013412@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 11 10:21:14 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 05:21:14 -0500
Subject: rpms/ecore/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200602111021.k1BALGnn013479@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


--- NEW 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 Feb 11 10:27:09 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 05:27:09 -0500
Subject: rpms/ecore import.log,1.1,1.2
Message-ID: <200602111027.k1BARg3E013694@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ecore/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Feb 2006 10:20:56 -0000	1.1
+++ import.log	11 Feb 2006 10:27:07 -0000	1.2
@@ -0,0 +1 @@
+ecore-0_9_9_023-1:HEAD:ecore-0.9.9.023-1.src.rpm:1139653590



From fedora-extras-commits at redhat.com  Sat Feb 11 10:27:21 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 05:27:21 -0500
Subject: rpms/ecore/devel ecore-0.9.9.023-noex.patch, NONE,
	1.1 ecore-0.9.9.023-novera.patch, NONE, 1.1 ecore.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602111027.k1BARr1k013698@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Added Files:
	ecore-0.9.9.023-noex.patch ecore-0.9.9.023-novera.patch 
	ecore.spec 
Log Message:
auto-import ecore-0.9.9.023-1 on branch devel from ecore-0.9.9.023-1.src.rpm

ecore-0.9.9.023-noex.patch:

--- NEW FILE ecore-0.9.9.023-noex.patch ---
--- ecore-0.9.9.023/configure.noex	2006-02-05 14:18:53.000000000 -0500
+++ ecore-0.9.9.023/configure	2006-02-05 14:19:12.000000000 -0500
@@ -27466,7 +27466,7 @@
 requirements=""
 
 
-                                                                                                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile ecore.pc data/Makefile data/fonts/Makefile data/images/Makefile data/pointers/Makefile src/Makefile src/bin/Makefile src/lib/Makefile src/lib/ecore/Makefile src/lib/ecore_job/Makefile src/lib/ecore_x/Makefile src/lib/ecore_fb/Makefile src/lib/ecore_evas/Makefile src/lib/ecore_con/Makefile src/lib/ecore_ipc/Makefile src/lib/ecore_txt/Makefile src/lib/ecore_config/Makefile src/lib/ecore_file/Makefile src/lib/ecore_dbus/Makefile src/lib/ecore_directfb/Makefile examples/Makefile ecore-config README ecore.spec ecore.oe ecore-native.oe ecore.bb ecoreXnative.bb debian/changelog"
+                                                                                                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile ecore.pc data/Makefile data/fonts/Makefile data/images/Makefile data/pointers/Makefile src/Makefile src/bin/Makefile src/lib/Makefile src/lib/ecore/Makefile src/lib/ecore_job/Makefile src/lib/ecore_x/Makefile src/lib/ecore_fb/Makefile src/lib/ecore_evas/Makefile src/lib/ecore_con/Makefile src/lib/ecore_ipc/Makefile src/lib/ecore_txt/Makefile src/lib/ecore_config/Makefile src/lib/ecore_file/Makefile src/lib/ecore_dbus/Makefile src/lib/ecore_directfb/Makefile ecore-config README ecore.spec ecore.oe ecore-native.oe ecore.bb ecoreXnative.bb debian/changelog"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -28318,7 +28318,6 @@
   "src/lib/ecore_file/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/ecore_file/Makefile" ;;
   "src/lib/ecore_dbus/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/ecore_dbus/Makefile" ;;
   "src/lib/ecore_directfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/ecore_directfb/Makefile" ;;
-  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
   "ecore-config" ) CONFIG_FILES="$CONFIG_FILES ecore-config" ;;
   "README" ) CONFIG_FILES="$CONFIG_FILES README" ;;
   "ecore.spec" ) CONFIG_FILES="$CONFIG_FILES ecore.spec" ;;
--- ecore-0.9.9.023/Makefile.in.noex	2006-01-12 00:35:38.000000000 -0500
+++ ecore-0.9.9.023/Makefile.in	2006-02-05 14:18:20.000000000 -0500
@@ -227,7 +227,7 @@
 x_ldflags = @x_ldflags@
 x_libs = @x_libs@
 
-SUBDIRS = data src examples
+SUBDIRS = data src
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \

ecore-0.9.9.023-novera.patch:

--- NEW FILE ecore-0.9.9.023-novera.patch ---
--- ecore-0.9.9.023/src/bin/ecore_evas_test.h.novera	2006-02-05 02:45:06.000000000 -0500
+++ ecore-0.9.9.023/src/bin/ecore_evas_test.h	2006-02-05 02:46:56.000000000 -0500
@@ -14,7 +14,7 @@
 
 #define IM PACKAGE_DATA_DIR"/images/"
 #define PT PACKAGE_DATA_DIR"/pointers/"
-#define FN PACKAGE_DATA_DIR"/fonts/"
+#define FN "/usr/share/fonts/bitstream-vera/"
 
 extern double       start_time;
 extern Ecore_Evas  *ee;
--- ecore-0.9.9.023/data/Makefile.in.novera	2006-02-05 02:44:04.000000000 -0500
+++ ecore-0.9.9.023/data/Makefile.in	2006-02-05 02:44:08.000000000 -0500
@@ -227,7 +227,7 @@
 x_ldflags = @x_ldflags@
 x_libs = @x_libs@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = fonts images pointers
+SUBDIRS = images pointers
 subdir = data
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


--- NEW FILE ecore.spec ---
Name:           ecore
Version:        0.9.9.023
Release:        1%{?dist}
Summary:        An event and X abstraction layer

Group:          System Environment/Libraries
License:        MIT
URL:            http://www.enlightenment.org/Libraries/Ecore/
Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
Patch:          ecore-0.9.9.023-novera.patch
Patch1:         ecore-0.9.9.023-noex.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  edb-devel eet-devel evas-devel directfb-devel
BuildRequires:  curl-devel libjpeg-devel
BuildRequires:  xorg-x11-devel

%description
Ecore is the core event abstraction layer and X abstraction layer that makes
doing selections, Xdnd, general X stuff, and event loops, timeouts and idle
handlers fast, optimized, and convenient. It's a separate library so anyone
can make use of the work put into Ecore to make this job easy for applications.

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

%description    devel
The ecore-devel package contains libraries and header files for developing
ecore applications.

%prep
%setup -q
%patch -p 1 -b .novera
%patch1 -p 1 -b .noex
rm examples/Makefile*

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

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

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING COPYING-PLAIN README
%{_bindir}/*_test
%{_datadir}/%{name}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples
%{_bindir}/*config
%{_datadir}/aclocal/*
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Sun Feb  5 2006 Ignacio Vazquez-Abrams  0.9.9.023-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Feb 2006 10:21:14 -0000	1.1
+++ .cvsignore	11 Feb 2006 10:27:21 -0000	1.2
@@ -0,0 +1 @@
+ecore-0.9.9.023.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Feb 2006 10:21:14 -0000	1.1
+++ sources	11 Feb 2006 10:27:21 -0000	1.2
@@ -0,0 +1 @@
+a12d806bbf687b371cd13743faff382e  ecore-0.9.9.023.tar.gz



From fedora-extras-commits at redhat.com  Sat Feb 11 10:36:07 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 05:36:07 -0500
Subject: owners owners.list,1.630,1.631
Message-ID: <200602111036.k1BAadAP014213@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	owners.list 
Log Message:
ecore


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.630
retrieving revision 1.631
diff -u -r1.630 -r1.631
--- owners.list	11 Feb 2006 09:38:54 -0000	1.630
+++ owners.list	11 Feb 2006 10:36:07 -0000	1.631
@@ -188,6 +188,7 @@
 Fedora Extras|dynamite|Extract data compressed with PKWARE Data Compression Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ecore|An event and X abstraction layer|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|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|



From fedora-extras-commits at redhat.com  Sat Feb 11 13:11:49 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Feb 2006 08:11:49 -0500
Subject: rpms/xemacs/devel xemacs-21.4.19-x-paths.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 xemacs.spec, 1.19,
	1.20 xemacs-21.4.17-x-paths.patch, 1.1, NONE
Message-ID: <200602111312.k1BDCL9u020155@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore sources xemacs.spec 
Added Files:
	xemacs-21.4.19-x-paths.patch 
Removed Files:
	xemacs-21.4.17-x-paths.patch 
Log Message:
* Thu Feb  2 2006 Ville Skytt??  - 21.4.19-2
- 21.4.19, X paths patch mostly applied upstream.


xemacs-21.4.19-x-paths.patch:

--- NEW FILE xemacs-21.4.19-x-paths.patch ---
--- xemacs-21.4.19/etc/xemacs.1~	2001-04-12 21:20:52.000000000 +0300
+++ xemacs-21.4.19/etc/xemacs.1	2006-02-02 01:55:34.000000000 +0200
@@ -293,7 +293,7 @@
 Sets the color of the text.
 
 See the file
-.I /usr/lib/X11/rgb.txt
+.I /usr/share/X11/rgb.txt
 for a list of valid
 color names.
 .TP
--- xemacs-21.4.19/etc/Emacs.ad~	2002-12-12 08:21:12.000000000 +0200
+++ xemacs-21.4.19/etc/Emacs.ad	2006-02-02 01:55:43.000000000 +0200
@@ -9,7 +9,7 @@
 ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
 ! effect.
 ! 
-! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
+! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs
 ! (or whatever the standard app-defaults directory is at your site) to cause
 ! it to be consulted at run-time.  (Do this only for site-wide customizations:
 ! personal customizations should be put into ~/.Xdefaults instead.)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2005 11:28:45 -0000	1.3
+++ .cvsignore	11 Feb 2006 13:11:48 -0000	1.4
@@ -1 +1 @@
-xemacs-21.4.18.tar.bz2
+xemacs-21.4.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2005 11:28:45 -0000	1.3
+++ sources	11 Feb 2006 13:11:48 -0000	1.4
@@ -1 +1 @@
-08c99ff915564a122a3a44df2264669c  xemacs-21.4.18.tar.bz2
+0d2d255e2b362064959f329d522b137b  xemacs-21.4.19.tar.bz2


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xemacs.spec	13 Dec 2005 16:06:27 -0000	1.19
+++ xemacs.spec	11 Feb 2006 13:11:48 -0000	1.20
@@ -7,7 +7,7 @@
 %define exectop %{_libdir}/xemacs-%{version}
 
 Name:           xemacs
-Version:        21.4.18
+Version:        21.4.19
 Release:        2%{?dist}
 Summary:        Different version of Emacs
 
@@ -22,7 +22,7 @@
 Source22:       delprevline.py
 Source23:       dotxemacs-init.el
 Source24:       default.el
-Patch1:         xemacs-21.4.17-x-paths.patch
+Patch1:         xemacs-21.4.19-x-paths.patch
 Patch10:        xemacs-21.4.10-find-paths-pkgdir.patch
 Patch11:        movemail-mktemp.patch
 Patch14:        menubar-games.patch
@@ -147,6 +147,8 @@
 
 f=etc/xemacs-ja.1 ; iconv -f euc-jp -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
+find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f
+
 ## lisp patches ##
 
 %patch1 -p1
@@ -447,6 +449,9 @@
 
 
 %changelog
+* Thu Feb  2 2006 Ville Skytt??  - 21.4.19-2
+- 21.4.19, X paths patch mostly applied upstream.
+
 * Tue Dec 13 2005 Ville Skytt?? 
 - Don't set Info-directory-list in site-start.el to fix honoring INFOPATH
   from the environment (Geert Kloosterman).


--- xemacs-21.4.17-x-paths.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Feb 11 13:28:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Feb 2006 08:28:34 -0500
Subject: rpms/uqm/devel .cvsignore,1.3,1.4 sources,1.3,1.4 uqm.spec,1.8,1.9
Message-ID: <200602111329.k1BDT6ab020309@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore sources uqm.spec 
Log Message:
* Mon Feb  6 2006 Ville Skytt??  - 0.5.0-1
- 0.5.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 May 2005 06:42:28 -0000	1.3
+++ .cvsignore	11 Feb 2006 13:28:33 -0000	1.4
@@ -1 +1 @@
-uqm-0.4.0-source.tar.gz
+uqm-0.5.0-source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 May 2005 06:42:29 -0000	1.3
+++ sources	11 Feb 2006 13:28:33 -0000	1.4
@@ -1 +1 @@
-17c2007297c9549916c452598dfc4235  uqm-0.4.0-source.tar.gz
+9002b1bc2de9285588dd97b618a867a7  uqm-0.5.0-source.tar.gz


Index: uqm.spec
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- uqm.spec	2 Jun 2005 15:16:25 -0000	1.8
+++ uqm.spec	11 Feb 2006 13:28:33 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           uqm
-Version:        0.4.0
-Release:        2
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
@@ -15,9 +15,14 @@
 
 # Exclude 64-bit archs, see bug 158705.
 ExcludeArch:    x86_64 ppc64 ia64 sparc64
-BuildRequires:  SDL-devel >= 1.2.3, SDL_image-devel, ImageMagick
-BuildRequires:  libvorbis-devel, zlib-devel, sed, desktop-file-utils
-Requires:       %{name}-content >= 0.4.0
+BuildRequires:  SDL-devel >= 1.2.8
+BuildRequires:  SDL_image-devel >= 1.2.4
+BuildRequires:  ImageMagick
+BuildRequires:  libvorbis-devel
+BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  libGLU-devel
+Requires:       %{name}-content >= 0.5.0
 
 %description
 The Ur-Quan Masters is a port of the classic game Star Control II to
@@ -81,6 +86,9 @@
 
 
 %changelog
+* Mon Feb  6 2006 Ville Skytt??  - 0.5.0-1
+- 0.5.0.
+
 * Thu Jun  2 2005 Ville Skytt??  - 0.4.0-2
 - Exclude 64-bit archs (#158705).
 



From fedora-extras-commits at redhat.com  Sat Feb 11 13:28:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Feb 2006 08:28:40 -0500
Subject: rpms/uqm-content/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 uqm-content.spec, 1.4, 1.5
Message-ID: <200602111329.k1BDTCVX020314@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/uqm-content/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20268/uqm-content/devel

Modified Files:
	.cvsignore sources uqm-content.spec 
Log Message:
* Mon Feb  6 2006 Ville Skytt??  - 0.5.0-1
- 0.5.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uqm-content/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 May 2005 06:45:44 -0000	1.3
+++ .cvsignore	11 Feb 2006 13:28:39 -0000	1.4
@@ -1,3 +1,3 @@
-uqm-0.4.0-content.uqm
-uqm-0.4.0-3domusic.uqm
-uqm-0.4.0-voice.uqm
+uqm-0.5.0-3domusic.uqm
+uqm-0.5.0-content.uqm
+uqm-0.5.0-voice.uqm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uqm-content/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 May 2005 06:45:44 -0000	1.3
+++ sources	11 Feb 2006 13:28:39 -0000	1.4
@@ -1,3 +1,3 @@
-f8daed517466d68805393e02a12fd642  uqm-0.4.0-content.uqm
-9073251b0d96393441f0b40016010576  uqm-0.4.0-3domusic.uqm
-52a084cfaa0bc7fcc63a295feb8cbd28  uqm-0.4.0-voice.uqm
+a20cacc8e66f5ff1fdf5e1d3a3b93fd2  uqm-0.5.0-3domusic.uqm
+1d03864b141a2626a7284bc7cfdefb47  uqm-0.5.0-content.uqm
+52a084cfaa0bc7fcc63a295feb8cbd28  uqm-0.5.0-voice.uqm


Index: uqm-content.spec
===================================================================
RCS file: /cvs/extras/rpms/uqm-content/devel/uqm-content.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uqm-content.spec	24 May 2005 06:45:44 -0000	1.4
+++ uqm-content.spec	11 Feb 2006 13:28:40 -0000	1.5
@@ -1,7 +1,7 @@
 %define uqm_contentdir %{_datadir}/games/uqm/content/packages
 
 Name:           uqm-content
-Version:        0.4.0
+Version:        0.5.0
 Release:        1
 Summary:        Base content files for The Ur-Quan Masters
 
@@ -14,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-PreReq:         uqm >= 0.4.0
+PreReq:         uqm >= 0.5.0
 
 %description
 %{summary}.
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Feb  6 2006 Ville Skytt??  - 0.5.0-1
+- 0.5.0.
+
 * Sun May 22 2005 Ville Skytt??  - 0.4.0-1
 - 0.4.0.
 



From fedora-extras-commits at redhat.com  Sat Feb 11 15:00:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 11 Feb 2006 10:00:49 -0500
Subject: rpms/liferea/devel .cvsignore, 1.20, 1.21 liferea.spec, 1.29,
	1.30 sources, 1.21, 1.22
Message-ID: <200602111501.k1BF1M0D024177@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Feb 10 2006 Brian Pepple  - 1.0.4-2
- Update to 1.0.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	1 Feb 2006 17:50:04 -0000	1.20
+++ .cvsignore	11 Feb 2006 15:00:49 -0000	1.21
@@ -1 +1 @@
-liferea-1.0.3.tar.gz
+liferea-1.0.4.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- liferea.spec	1 Feb 2006 17:50:04 -0000	1.29
+++ liferea.spec	11 Feb 2006 15:00:49 -0000	1.30
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.3
+Version:        1.0.4
 Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Brian Pepple  - 1.0.4-2
+- Update to 1.0.4.
+
 * Tue Jan 31 2006 Brian Pepple  - 1.0.3-2
 - Update to 1.0.3.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	1 Feb 2006 17:50:04 -0000	1.21
+++ sources	11 Feb 2006 15:00:49 -0000	1.22
@@ -1 +1 @@
-40232e6884e4ae9628916868a9a9c828  liferea-1.0.3.tar.gz
+0da70de584e937367026c97156c129c9  liferea-1.0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Feb 11 15:04:27 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 11 Feb 2006 10:04:27 -0500
Subject: rpms/gnomebaker/devel gnomebaker.spec,1.2,1.3
Message-ID: <200602111505.k1BF52JG024282@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	gnomebaker.spec 
Log Message:
* Sat Feb 11 2006 Brian Pepple  - 0.5.1-3
- Rebuild.



Index: gnomebaker.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomebaker.spec	6 Feb 2006 14:02:12 -0000	1.2
+++ gnomebaker.spec	11 Feb 2006 15:04:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Gnome CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sat Feb 11 2006 Brian Pepple  - 0.5.1-3
+- Rebuild.
+
 * Mon Feb  6 2006 Brian Pepple  - 0.5.1-2
 - Bump release.
 



From fedora-extras-commits at redhat.com  Sat Feb 11 15:52:14 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 10:52:14 -0500
Subject: rpms/evas/devel evas.spec,1.1,1.2
Message-ID: <200602111552.k1BFqkEl025190@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	evas.spec 
Log Message:
Modular X


Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/evas.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evas.spec	10 Feb 2006 18:47:45 -0000	1.1
+++ evas.spec	11 Feb 2006 15:52:13 -0000	1.2
@@ -12,7 +12,9 @@
 
 BuildRequires:  edb-devel eet-devel freetype-devel directfb-devel libpng-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-proto-devel libX11-devel libXext-devel
+BuildRequires:  libXrender-devel mesa-libGL-devel mesa-libGLU-devel
+BuildRequires:  libICE-devel
 
 %description
 Evas is a hardware-accelerated canvas API for X-Windows that can draw



From fedora-extras-commits at redhat.com  Sat Feb 11 16:31:59 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Sat, 11 Feb 2006 11:31:59 -0500
Subject: rpms/allegro/devel allegro.spec,1.23,1.24
Message-ID: <200602111632.k1BGWW8L027230@cvs-int.fedora.redhat.com>

Author: jnovy

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

Modified Files:
	allegro.spec 
Log Message:
* Tue Feb  8 2006 Jindrich Novy  4.2.0-7
- set timidity++ as Requires instead of BuildRequires



Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- allegro.spec	7 Feb 2006 12:20:21 -0000	1.23
+++ allegro.spec	11 Feb 2006 16:31:59 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        6
+Release:        7
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -20,7 +20,8 @@
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
 BuildRequires:  libXpm-devel, libXcursor-devel, libXxf86vm-devel
-BuildRequires:  libXxf86dga-devel, timidity++
+BuildRequires:  libXxf86dga-devel
+Requires:	timidity++
 
 %description
 Allegro is a cross-platform library intended for use in computer games
@@ -209,6 +210,9 @@
 
 
 %changelog
+* Tue Feb  8 2006 Jindrich Novy  4.2.0-7
+- set timidity++ as Requires instead of BuildRequires
+
 * Tue Feb  7 2006 Jindrich Novy  4.2.0-6
 - fix digmid loading of timidity midi patches (#180154)
 



From fedora-extras-commits at redhat.com  Sat Feb 11 18:54:49 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Sat, 11 Feb 2006 13:54:49 -0500
Subject: rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors.spec,1.6,1.7
Message-ID: <200602111855.k1BItLti032057@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-sensors/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32040

Modified Files:
	gnome-applet-sensors.spec 
Log Message:
* Sat Feb 11 2006 Aaron Kurtz  - 1.4-4
- add ExcludeArch due to lack of ppc lm_sensors



Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/gnome-applet-sensors.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-sensors.spec	8 Feb 2006 04:32:38 -0000	1.6
+++ gnome-applet-sensors.spec	11 Feb 2006 18:54:48 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-applet-sensors
 Version:        1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 
 Group:          User Interface/Desktops
@@ -13,6 +13,7 @@
 BuildRequires: gettext
 BuildRequires: gnome-panel-devel >= 2.8
 Requires: lm_sensors
+ExcludeArch: ppc
 
 %description
 GNOME Sensors Applet is an applet for the GNOME Panel to display readings
@@ -25,7 +26,7 @@
 Alarms can be set for each sensor to notify the user once a certain value
 has been reached, and can be configured to execute a given command at given
 repeated intervals.
-GNOME HIG v2.0 compliant
+GNOME HIG v2.0 compliant.
 
 
 %prep
@@ -59,6 +60,9 @@
 
 
 %changelog
+* Sat Feb 11 2006 Aaron Kurtz  - 1.4-4
+- add ExcludeArch due to lack of ppc lm_sensors
+
 * Tue Feb 06 2006 Aaron Kurtz  - 1.4-3
 - make that lm_sensors
 



From fedora-extras-commits at redhat.com  Sat Feb 11 18:59:50 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 11 Feb 2006 13:59:50 -0500
Subject: rpms/celestia/devel celestia-1.4.0-compile.patch, NONE,
	1.1 .cvsignore, 
	1.4, 1.5 celestia.spec, 1.13, 1.14 sources, 1.4, 1.5
Message-ID: <200602111900.k1BJ0M7k032144@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore celestia.spec sources 
Added Files:
	celestia-1.4.0-compile.patch 
Log Message:
Update to CVS snapshot to fix various compile issues.

celestia-1.4.0-compile.patch:

--- NEW FILE celestia-1.4.0-compile.patch ---
--- src/celengine/star.h.orig	2005-12-06 11:30:23.000000000 -0600
+++ src/celengine/star.h	2006-02-10 15:21:49.000000000 -0600
@@ -30,7 +30,7 @@
     // orbits and StarDetails objects.  Currently, it's assumed that they
     // have lifetimes that continue until program termination.
  public:
-    StarDetails::StarDetails();
+    StarDetails();
 
     inline float getRadius() const;
     inline float getTemperature() const;
--- src/celengine/command.h.orig	2004-12-22 16:07:15.000000000 -0600
+++ src/celengine/command.h	2006-02-10 18:46:25.000000000 -0600
@@ -94,10 +94,10 @@
 class CommandGotoLongLat : public InstantaneousCommand
 {
  public:
-    CommandGotoLongLat::CommandGotoLongLat(double t,
-                                           double dist,
-                                           float _longitude, float _latitude,
-                                           Vec3f _up);
+    CommandGotoLongLat(double t,
+                       double dist,
+                       float _longitude, float _latitude,
+                       Vec3f _up);
     ~CommandGotoLongLat();
     void process(ExecutionEnvironment&);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Dec 2005 22:50:48 -0000	1.4
+++ .cvsignore	11 Feb 2006 18:59:50 -0000	1.5
@@ -1 +1 @@
-celestia-1.4.0.tar.gz
+celestia-1.4.0.20060210cvs.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- celestia.spec	21 Jan 2006 01:09:26 -0000	1.13
+++ celestia.spec	11 Feb 2006 18:59:50 -0000	1.14
@@ -1,13 +1,15 @@
 Name:           celestia
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.4.0.20060210cvs
+Release:        1%{?dist}
 
 Summary:        OpenGL real-time visual space simulation
 
 Group:          Amusements/Graphics
 License:        GPL
-Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
+#Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
+Source0:        celestia-%{version}.tar.gz
 Source3:        celestia.desktop
+Patch0:         celestia-1.4.0-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,6 +22,9 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
+# For the CVS snapshot.
+BuildRequires:  gettext-devel
+
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -39,9 +44,11 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 %build
+make -f Makefile.cvs
+
 export GTK_LIBS="$( pkg-config --libs gtk+-2.0 ) -lpangox-1.0"
 %configure --with-gnome
 make %{?_smp_mflags}
@@ -58,7 +65,7 @@
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
 rm $RPM_BUILD_ROOT%{_datadir}/celestia/{controls.txt,COPYING}
 ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/
-rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual
+#rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual
 
 rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop
 
@@ -90,7 +97,9 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO controls.txt manual/*.html manual/*.css
+%doc AUTHORS ChangeLog COPYING README TODO controls.txt
+# Seem to have gone away in post-1.4.0 CVS...
+#%doc manual/*.html manual/*.css
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*%{name}.desktop
@@ -99,6 +108,12 @@
 
 
 %changelog
+* Fri Feb 10 2006 Steven Pritchard  1.4.0.20060210cvs-1
+- Update to today's CVS snapshot
+
+* Fri Feb 10 2006 Steven Pritchard  1.4.0-3
+- Add celestia-1.4.0-compile.patch to fix a bug when compiling with g++ 4.1
+
 * Thu Jan 05 2006 Steven Pritchard  1.4.0-2
 - Add BR: libGLU-devel, libXt-devel, libXmu-devel
 - Add -lpangox-1.0 to GTK_LIBS


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Dec 2005 22:50:48 -0000	1.4
+++ sources	11 Feb 2006 18:59:50 -0000	1.5
@@ -1 +1 @@
-d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz
+3ce623baf6113ddf6425f0ab31b2dd37  celestia-1.4.0.20060210cvs.tar.gz



From fedora-extras-commits at redhat.com  Sat Feb 11 19:33:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 11 Feb 2006 14:33:16 -0500
Subject: rpms/scorched3d/devel scorched3d-HTML-injection.patch, NONE,
	1.1 scorched3d-XML-injection.patch, NONE,
	1.1 scorched3d-formatstring.patch, NONE,
	1.1 scorched3d-negint.patch, NONE, 1.1 scorched3d-pgsql.patch,
	NONE, 1.1 scorched3d-sprintf.patch, NONE,
	1.1 scorched3d-strxxx.patch, NONE, 1.1 scorched3d.spec, 1.10,
	1.11 scorched3d-buf.patch, 1.1, NONE
Message-ID: <200602111933.k1BJXnpN001761@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	scorched3d.spec 
Added Files:
	scorched3d-HTML-injection.patch scorched3d-XML-injection.patch 
	scorched3d-formatstring.patch scorched3d-negint.patch 
	scorched3d-pgsql.patch scorched3d-sprintf.patch 
	scorched3d-strxxx.patch 
Removed Files:
	scorched3d-buf.patch 
Log Message:
scorched3d-39_1-2

scorched3d-HTML-injection.patch:

--- NEW FILE scorched3d-HTML-injection.patch ---
--- scorched/src/server/ServerWebHandler.cpp.injection	2006-02-11 18:43:38.000000000 +0100
+++ scorched/src/server/ServerWebHandler.cpp	2006-02-11 19:05:51.000000000 +0100
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 static const char *getField(std::map &fields, const char *field)
 {
@@ -117,6 +118,9 @@
 	for (itor = tanks.begin(); itor != tanks.end(); itor++)
 	{
 		Tank *tank = (*itor).second;
+		std::string cleanName;
+		std::string dirtyName(tank->getName());
+		XMLParser::removeSpecialChars(dirtyName, cleanName);
 		players += formatString(
 			""
 			"dest=%i ip=%s id=%i" // Id
@@ -129,7 +133,7 @@
 			"" // Select
 			"\n",
 			tank->getDestinationId(), NetInterface::getIpName(tank->getIpAddress()), tank->getPlayerId(),
-			tank->getName(),
+			cleanName.c_str(),
 			tank->getTankAI()?tank->getTankAI()->getName():"Human",
 			tank->getScore().getTimePlayedString(),
 			tank->getScore().getScoreString(),
@@ -178,13 +182,15 @@
 	int max = MIN((int) entries.size(), start + pagesize);
 	for (int i=min; i"
 			"%u"
 			"%s"
 			"\n",
 			i,
-			entries[i].text.c_str());
+			cleanText.c_str());
 	}
 	fields["LOG"] = log;
 
@@ -335,7 +341,9 @@
 		textsListItor != textsList.end();
 		textsListItor++)
 	{
-		texts += (*textsListItor);
+		std::string cleanText;
+		XMLParser::removeSpecialChars((*textsListItor), cleanText);
+		texts += cleanText;
 		texts += "
    \n";
 	}
 	fields["TEXTS"] = texts;
@@ -375,11 +383,13 @@
 			if (selected && 0 == strcmp(selected, ipName.c_str()))
 				entry.type = ServerBanned::NotBanned;
 
+			std::string cleanName;
+			XMLParser::removeSpecialChars(entry.name, cleanName);
 			banned += formatString("%s%s%s%s%s%s"
 				"" // Select
 				"",
 				(entry.bantime?ctime(&entry.bantime):""),
-				entry.name.c_str(),
+				cleanName.c_str(),
 				entry.uniqueid.c_str(),
 				ServerBanned::getBannedTypeStr(entry.type),
 				ipName.c_str(), mask.c_str(),
@@ -407,8 +417,11 @@
 		itor++)
 	{
 		ModFileEntry *entry = (*itor).second;
+		std::string cleanFileName;
+		std::string dirtyFileName(entry->getFileName());
+		XMLParser::removeSpecialChars(dirtyFileName, cleanFileName);
 		modfiles += formatString("%s%u%u%u",
-			entry->getFileName(), 
+			cleanFileName.c_str(),
 			entry->getCompressedSize(),
 			entry->getCompressedCrc(),
 			entry->getUncompressedSize());

scorched3d-XML-injection.patch:

--- NEW FILE scorched3d-XML-injection.patch ---
diff -ur scorched.orig/src/GLEXT/GLConsoleFileReader.cpp scorched/src/GLEXT/GLConsoleFileReader.cpp
--- scorched.orig/src/GLEXT/GLConsoleFileReader.cpp	2006-02-11 15:40:45.000000000 +0100
+++ scorched/src/GLEXT/GLConsoleFileReader.cpp	2006-02-11 15:45:05.000000000 +0100
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 bool GLConsoleFileReader::loadFileIntoConsole(const char *fileName,
@@ -62,15 +63,18 @@
 		itor != lines.end();
 		itor++)
 	{
-		std::string string;
-		const char *line = (*itor)->getLine();
+		std::string cleanLine;
+		std::string dirtyLine((*itor)->getLine());
+		XMLParser::removeSpecialChars(dirtyLine, cleanLine);
 		if ((*itor)->getLineType() != GLConsoleLine::eNone)
 		{
-			filelines.addLine("  %s", line);
+			filelines.addLine("  %s",
+				cleanLine.c_str());
 		}
 		else
 		{
-			filelines.addLine("  ", line);
+			filelines.addLine("  ",
+				cleanLine.c_str());
 		}
 	}
 
Only in scorched/src/GLEXT: GLConsoleFileReader.cpp~
diff -ur scorched.orig/src/XML/XMLParser.cpp scorched/src/XML/XMLParser.cpp
--- scorched.orig/src/XML/XMLParser.cpp	2006-02-11 15:40:45.000000000 +0100
+++ scorched/src/XML/XMLParser.cpp	2006-02-11 15:39:50.000000000 +0100
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-static void removeSpecialChars(std::string &content, std::string &result)
+void XMLParser::removeSpecialChars(std::string &content, std::string &result)
 {
 	result = "";
 	for (char *c=(char *) content.c_str(); *c; c++)
@@ -174,7 +174,7 @@
 			DIALOG_ASSERT(node->type_ == XMLParameterType);
 			
 			std::string newContent;
-			removeSpecialChars(node->content_, newContent);
+			XMLParser::removeSpecialChars(node->content_, newContent);
 			
 			params += " " + node->name_ + "='" + newContent + "'";
 		}
@@ -182,7 +182,7 @@
 		if (children_.empty())
 		{
 			std::string newContent;
-			removeSpecialChars(content_, newContent);
+			XMLParser::removeSpecialChars(content_, newContent);
 			
 			lines.addLine("%s<%s%s>%s", 
 				getSpacer(spacing),
diff -ur scorched.orig/src/XML/XMLParser.h scorched/src/XML/XMLParser.h
--- scorched.orig/src/XML/XMLParser.h	2006-02-11 15:40:45.000000000 +0100
+++ scorched/src/XML/XMLParser.h	2006-02-11 15:39:50.000000000 +0100
@@ -121,6 +121,9 @@
 	void setSource(const char *source) { source_ = source; }
 	XMLNode *getRoot() { return root_; }
 
+	static void removeSpecialChars(std::string &content,
+		std::string &result);
+
 protected:
 	XMLNode *root_;
 	XMLNode *current_;
diff -ur scorched.orig/src/weapons/EconomyFreeMarket.cpp scorched/src/weapons/EconomyFreeMarket.cpp
--- scorched.orig/src/weapons/EconomyFreeMarket.cpp	2006-02-11 15:40:45.000000000 +0100
+++ scorched/src/weapons/EconomyFreeMarket.cpp	2006-02-11 15:48:19.000000000 +0100
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -123,8 +124,11 @@
 			accessory->getStartingNumber() != -1 && 
 			accessory->getType() == AccessoryPart::AccessoryWeapon)
 		{
+			std::string cleanName;
+			std::string dirtyName(accessory->getName());
+			XMLParser::removeSpecialChars(dirtyName, cleanName);
 			file.addLine("  ");
-			file.addLine("    %s", accessory->getName());
+			file.addLine("    %s", cleanName.c_str());
 			file.addLine("    %i", accessory->getPrice());
 			file.addLine("  ");
 		}
Only in scorched/src/weapons: EconomyFreeMarket.cpp~

scorched3d-formatstring.patch:

--- NEW FILE scorched3d-formatstring.patch ---
diff -ur scorched.orig/src/3dsparse/ModelID.cpp scorched/src/3dsparse/ModelID.cpp
--- scorched.orig/src/3dsparse/ModelID.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/3dsparse/ModelID.cpp	2006-02-11 15:21:36.000000000 +0100
@@ -77,7 +77,7 @@
 		static char meshName[1024];
 		snprintf(meshName, sizeof(meshName), "%s/%s", directory,
 			meshNameContent);
-		if (!DefinesUtil::fileExists(getDataFile(meshName)))
+		if (!DefinesUtil::fileExists(getDataFile("%s", meshName)))
 		{
 			dialogMessage("Scorched Models",
 						"Mesh file \"%s\"does not exist",
@@ -92,7 +92,7 @@
 		{
 			snprintf(skinName, sizeof(skinName), "%s/%s",
 				directory, skinNameContent);
-			if (!DefinesUtil::fileExists(getDataFile(skinName)))
+			if (!DefinesUtil::fileExists(getDataFile("%s", skinName)))
 			{
 				dialogMessage("Scorched Models",
 							"Skin file \"%s\" does not exist",
@@ -116,7 +116,7 @@
 		snprintf(meshName, sizeof(meshName), "%s/%s", directory,
 			meshNameContent);
 
-		if (!DefinesUtil::fileExists(getDataFile(meshName)))
+		if (!DefinesUtil::fileExists(getDataFile("%s", meshName)))
 		{
 			dialogMessage("Scorched Models",
 						"Mesh file \"%s\"does not exist",
Only in scorched/src/3dsparse: ModelID.cpp~
diff -ur scorched.orig/src/3dsparse/ModelStore.cpp scorched/src/3dsparse/ModelStore.cpp
--- scorched.orig/src/3dsparse/ModelStore.cpp	2005-04-12 00:19:08.000000000 +0200
+++ scorched/src/3dsparse/ModelStore.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -134,18 +134,18 @@
 	if (0 == strcmp(id.getType(), "ase"))
 	{
 		// Load the ASEFile containing the tank definitions
-		std::string meshName(getDataFile(id.getMeshName()));
+		std::string meshName(getDataFile("%s", id.getMeshName()));
 
 		bool noSkin = 
 			(0 == strcmp("none", id.getSkinName()));
 		ASEModelFactory factory;
 		model = factory.createModel(meshName.c_str(), 
-			(noSkin?"":getDataFile(id.getSkinName())));
+			(noSkin?"":getDataFile("%s", id.getSkinName())));
 	}
 	else
 	{
 		// Load the Milkshape containing the tank definitions
-		std::string meshName(getDataFile(id.getMeshName()));
+		std::string meshName(getDataFile("%s", id.getMeshName()));
 		MSModelFactory factory;
 		model = factory.createModel(meshName.c_str());		
 	}
diff -ur scorched.orig/src/3dsparse/aseFile.tab.cpp scorched/src/3dsparse/aseFile.tab.cpp
--- scorched.orig/src/3dsparse/aseFile.tab.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/3dsparse/aseFile.tab.cpp	2006-02-11 15:22:13.000000000 +0100
@@ -1057,7 +1057,7 @@
 {
 	char buffer[1024];
 	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, errmsg);
-	dialogMessage("Lexer", buffer);
+	dialogMessage("Lexer", "%s", buffer);
     return 0;
 }
 
@@ -1065,7 +1065,7 @@
 {
 	char buffer[1024];
 	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, warningmsg);
-	dialogMessage("Lexer", buffer);
+	dialogMessage("Lexer", "%s", buffer);
     return 0;
 }
 
@@ -1073,6 +1073,6 @@
 {
 	char buffer[1024];
 	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, debugmsg);
-	dialogMessage("Lexer", buffer);
+	dialogMessage("Lexer", "%s", buffer);
     return 0;
 }
Only in scorched/src/3dsparse: aseFile.tab.cpp~
diff -ur scorched.orig/src/GLEXT/GLConsole.cpp scorched/src/GLEXT/GLConsole.cpp
--- scorched.orig/src/GLEXT/GLConsole.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/GLEXT/GLConsole.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -53,7 +53,7 @@
 
 void GLConsole::logMessage(LoggerInfo &info)
 {
-	addLine(false, info.getMessage());
+	addLine(false, "%s", info.getMessage());
 }
 
 void GLConsole::keyboardCheck(const unsigned state, float frameTime, 
@@ -111,7 +111,7 @@
 								itor != matches.end();
 								itor++)
 							{
-								addLine(false, (*itor)->getName());
+								addLine(false, "%s", (*itor)->getName());
 							}
 						}
 					}
@@ -160,7 +160,7 @@
 			KeyboardKey *key = (*keyItor);
 			if (key->keyDown(buffer, keyState, false))
 			{
-				addLine(true, key->getName());
+				addLine(true, "%s", key->getName());
 			}
 		}
 	}
diff -ur scorched.orig/src/GLEXT/GLConsoleFileReader.cpp scorched/src/GLEXT/GLConsoleFileReader.cpp
--- scorched.orig/src/GLEXT/GLConsoleFileReader.cpp	2005-04-12 19:06:13.000000000 +0200
+++ scorched/src/GLEXT/GLConsoleFileReader.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -45,7 +45,7 @@
 		XMLNode *currentNode = (*childrenItor);		
 		if (strcmp(currentNode->getName(), "command")==0)
 		{
-			GLConsole::instance()->addLine(true, currentNode->getContent());
+			GLConsole::instance()->addLine(true, "%s", currentNode->getContent());
 		}
 	}
 	return true;
diff -ur scorched.orig/src/GLEXT/GLStateExtension.cpp scorched/src/GLEXT/GLStateExtension.cpp
--- scorched.orig/src/GLEXT/GLStateExtension.cpp	2004-09-09 20:03:49.000000000 +0200
+++ scorched/src/GLEXT/GLStateExtension.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -122,13 +122,13 @@
 // HACK for skin creator
 #ifdef dDOUBLE
 	GLConsole::instance()->addLine(false, "GL_VENDOR:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_VENDOR));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_VENDOR));
 	GLConsole::instance()->addLine(false, "GL_RENDERER:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_RENDERER));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_RENDERER));
 	GLConsole::instance()->addLine(false, "GL_VERSION:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_VERSION));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_VERSION));
 	GLConsole::instance()->addLine(false, "GL_EXTENSIONS:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_EXTENSIONS));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_EXTENSIONS));
 	GLConsole::instance()->addLine(false, "TEXTURE_UNITS:");
 	GLConsole::instance()->addLine(false, "%s (%i units)", ((glActiveTextureARB_==0)?"Off":"On"),textureUnits_);
 	GLConsole::instance()->addLine(false, "VBO:");
diff -ur scorched.orig/src/GLW/GLWDropDown.cpp scorched/src/GLW/GLWDropDown.cpp
--- scorched.orig/src/GLW/GLWDropDown.cpp	2004-06-18 01:40:41.000000000 +0200
+++ scorched/src/GLW/GLWDropDown.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -122,7 +122,7 @@
 	GLWFont::instance()->getLargePtFont()->drawWidth(
 		(int) w_ - 25,
 		GLWFont::widgetFontColor, 14,
-		x_ + 5.0f, y_ + 5.0f, 0.0f, text_.c_str());
+		x_ + 5.0f, y_ + 5.0f, 0.0f, "%s", text_.c_str());
 }
 
 void GLWDropDown::buttonDown(unsigned int id)
diff -ur scorched.orig/src/GLW/GLWIcon.cpp scorched/src/GLW/GLWIcon.cpp
--- scorched.orig/src/GLW/GLWIcon.cpp	2004-09-10 14:45:45.000000000 +0200
+++ scorched/src/GLW/GLWIcon.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -72,9 +72,9 @@
 	if (bitmapNode && bitmapANode)
 	{
 		std::string bitmapName = 
-			getDataFile(bitmapNode->getContent());
+			getDataFile("%s", bitmapNode->getContent());
 		std::string bitmapAName = 
-			getDataFile(bitmapANode->getContent());
+			getDataFile("%s", bitmapANode->getContent());
 
 		texture_ = ModelStore::instance()->loadTexture(
 			bitmapName.c_str(), bitmapAName.c_str(), invert);
diff -ur scorched.orig/src/GLW/GLWLabel.cpp scorched/src/GLW/GLWLabel.cpp
--- scorched.orig/src/GLW/GLWLabel.cpp	2005-06-20 15:15:39.000000000 +0200
+++ scorched/src/GLW/GLWLabel.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -56,7 +56,7 @@
 void GLWLabel::calcWidth()
 {
 	if (w_ == 0.0f) w_ = (float) GLWFont::instance()->getLargePtFont()->getWidth(
-		size_, (char *) buttonText_.c_str());
+		size_, "%s", (char *) buttonText_.c_str());
 }
 
 void GLWLabel::draw()
@@ -67,5 +67,5 @@
 	calcWidth();
 	GLWFont::instance()->getLargePtFont()->draw(
 		color_, size_,
-		x_, y_ + 6.0f, 0.0f, (char *) buttonText_.c_str());
+		x_, y_ + 6.0f, 0.0f, "%s", (char *) buttonText_.c_str());
 }
diff -ur scorched.orig/src/GLW/GLWLoggerView.cpp scorched/src/GLW/GLWLoggerView.cpp
--- scorched.orig/src/GLW/GLWLoggerView.cpp	2005-07-11 22:40:38.000000000 +0200
+++ scorched/src/GLW/GLWLoggerView.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -133,14 +133,14 @@
 			{
 				// Figure texture width
 				float minus = GLWFont::instance()->getLargePtFont()->
-					getWidth(fontSize_, entry.info.getMessage()) / 2.0f;
+					getWidth(fontSize_, "%s", entry.info.getMessage()) / 2.0f;
 				float x = x_ + w_ / 2.0f - minus - 1;
 				float y = start - i * lineDepth_ - 1;
 
 				// Draw outline
  				GLWFont::instance()->getSmallPtFontOutline()->
  					drawOutline(black, outlineFontSize_, fontSize_,
- 						x, y, 0.0f, 
+ 						x, y, 0.0f, "%s",
  						entry.info.getMessage());
 			}
 			else
@@ -153,15 +153,15 @@
 				float x = x_ + w_ / 2.0f;
 				float y = start - i * lineDepth_;
 				float minusSource = (float) GLWFont::instance()->getLargePtFont()->
-					getWidth(fontSize_, source->getName());
+					getWidth(fontSize_, "%s", source->getName());
 
  				GLWFont::instance()->getSmallPtFontOutline()->
  					drawOutline(black, outlineFontSize_, fontSize_,
- 						x - minusSource - outlineFontSize_ / 2.0f - 2.0f, y, 0.0f, 
+ 						x - minusSource - outlineFontSize_ / 2.0f - 2.0f, y, 0.0f, "%s",
 						source->getName());
  				GLWFont::instance()->getSmallPtFontOutline()->
  					drawOutline(black, outlineFontSize_, fontSize_,
- 						x + outlineFontSize_ / 2.0f + 2.0f, y, 0.0f, 
+ 						x + outlineFontSize_ / 2.0f + 2.0f, y, 0.0f, "%s",
 						dest->getName());
 			}
 
@@ -180,7 +180,7 @@
 			{
 				// Figure texture width
 				float minus = GLWFont::instance()->getLargePtFont()->
-					getWidth(fontSize_, entry.info.getMessage()) / 2.0f;
+					getWidth(fontSize_, "%s", entry.info.getMessage()) / 2.0f;
 				float x = x_ + w_ / 2.0f  - minus;
 				float y = start - i * lineDepth_;
 
@@ -220,19 +220,19 @@
 					GLWFont::instance()->getLargePtFont()->
 						drawSubStr(0, entry.info.getInfoLen(),
 							source?source->getColor():dColor, fontSize_,
-							x, y, 0.0f, 
+							x, y, 0.0f, "%s",
 							entry.info.getMessage());
 					GLWFont::instance()->getLargePtFont()->
 						drawSubStr(entry.info.getInfoLen(), entry.info.getMessageLen(),
 							dColor, fontSize_,
-							x, y, 0.0f, 
+							x, y, 0.0f, "%s",
 							entry.info.getMessage());
 				}
 				else
 				{
 					GLWFont::instance()->getLargePtFont()->
 						draw(dColor, fontSize_,
-							x, y, 0.0f, 
+							x, y, 0.0f, "%s",
 							entry.info.getMessage());
 				}
 			}
@@ -246,16 +246,16 @@
 				float x = x_ + w_ / 2.0f;
 				float y = start - i * lineDepth_;
 				float minusSource = (float) GLWFont::instance()->getLargePtFont()->
-					getWidth(fontSize_, source->getName());
+					getWidth(fontSize_, "%s", source->getName());
 
 				GLWFont::instance()->getLargePtFont()->
 					draw(source?source->getColor():defaultColor, fontSize_,
 						x - minusSource - outlineFontSize_ / 2.0f - 4.0f, y, 0.0f, 
-						source->getName());
+						"%s", source->getName());
 				GLWFont::instance()->getLargePtFont()->
 					draw(dest?dest->getColor():defaultColor, fontSize_,
 						x + outlineFontSize_ / 2.0f + 4.0f, y, 0.0f, 
-						dest->getName());
+						"%s", dest->getName());
 
 				if (entry.info.getIcon())
 				{
diff -ur scorched.orig/src/GLW/GLWScorchedInfo.cpp scorched/src/GLW/GLWScorchedInfo.cpp
--- scorched.orig/src/GLW/GLWScorchedInfo.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/GLW/GLWScorchedInfo.cpp	2006-02-11 15:23:34.000000000 +0100
@@ -92,12 +92,12 @@
 			}
 			float windwidth = (float) GLWFont::instance()->
 				getSmallPtFont()->getWidth(
-				fontSize_, buffer);
+				fontSize_, "%s", buffer);
 			float offSet = 0.0f;
 			if (!noCenter_) offSet = w_ / 2.0f - (windwidth / 2.0f);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				*fontColor, fontSize_,
-				x_ + offSet, y_, 0.0f,
+				x_ + offSet, y_, 0.0f, "%s",
 				buffer);                    
 		}
 		break;
@@ -125,12 +125,12 @@
 		{
 			setToolTip(&model->getTips()->nameTip);
 			float namewidth = (float) GLWFont::instance()->getSmallPtFont()->getWidth(
-				fontSize_, current->getName());
+				fontSize_, "%s", current->getName());
 			float offSet = 0.0f;
 			if (!noCenter_) offSet = w_ / 2.0f - (namewidth / 2.0f);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				current->getColor(), fontSize_,
-				x_ + offSet, y_, 0.0f,
+				x_ + offSet, y_, 0.0f, "%s",
 				current->getName());
 		}
 		break;
@@ -157,7 +157,7 @@
 			setToolTip(&model->getTips()->nameTip);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				current->getColor(), fontSize_,
-				x_, y_, 0.0f,
+				x_, y_, 0.0f, "%s",
 				current->getScore().getStatsRank());
 		}
 		break;
@@ -165,7 +165,7 @@
 			setToolTip(&model->getTips()->autodTip);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				*fontColor, fontSize_,
-				x_, y_, 0.0f,
+				x_, y_, 0.0f, "%s",
 				(current->getAccessories().getAutoDefense().haveDefense()?"On":"Off"));
 		break;
 		case eParachuteCount:
@@ -240,13 +240,13 @@
 			snprintf(buffer, sizeof(buffer), "%s",
 				current->getAccessories().getWeapons().getCurrent()->getName());
 			float weaponWidth = (float) GLWFont::instance()->getSmallPtFont()->
-				getWidth(fontSize_, buffer);
+				getWidth(fontSize_, "%s", buffer);
 
 			float offSet = 0.0f;
 			if (!noCenter_) offSet = w_ / 2.0f - (weaponWidth / 2.0f);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				*fontColor, fontSize_,
-				x_ + offSet, y_, 0.0f,
+				x_ + offSet, y_, 0.0f, "%s",
 				buffer);
 		}
 		break;
Only in scorched/src/GLW: GLWScorchedInfo.cpp~
diff -ur scorched.orig/src/GLW/GLWSelectorPart.cpp scorched/src/GLW/GLWSelectorPart.cpp
--- scorched.orig/src/GLW/GLWSelectorPart.cpp	2004-12-27 17:53:10.000000000 +0100
+++ scorched/src/GLW/GLWSelectorPart.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -62,7 +62,7 @@
 
 		// Get width
 		float currentwidth = 
-			(float) font.getWidth(12, (char *) item.getText()) + 20.0f;
+			(float) font.getWidth(12, "%s", (char *) item.getText()) + 20.0f;
 		if (item.getSelected()) selected_ = true;
 		if (item.getIcon()) icon_ = true;
 		if (currentwidth > selectedWidth) selectedWidth = currentwidth;
@@ -196,7 +196,7 @@
 					currentTop - 16.0f, 0.0f, "x");
 			}
 			font.draw(*c, 12, selectedX_ + selectedIndent_ + 10.0f, 
-				currentTop - 16.0f, 0.0f, (char *) item.getText());
+				currentTop - 16.0f, 0.0f, "%s", (char *) item.getText());
 			currentTop -= 18.0f;
 		}
 	}
Only in scorched/src/GLW: GLWSelectorPart.cpp.orig
diff -ur scorched.orig/src/GLW/GLWToolTip.cpp scorched/src/GLW/GLWToolTip.cpp
--- scorched.orig/src/GLW/GLWToolTip.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/GLW/GLWToolTip.cpp	2006-02-11 15:20:24.000000000 +0100
@@ -39,7 +39,7 @@
 GLWTip::GLWTip(const char *tit, const char *tex) 
 	: id_(++nextId_), x(0), y(0), w(0), h(0), handler_(0)
 {
-	setText(tit, tex);
+	setText(tit, "%s", tex);
 }
 
 GLWTip::~GLWTip()
@@ -84,12 +84,12 @@
 	for (itor = texts.begin(); itor != enditor; itor++)
 	{
 		float width = float(GLWFont::instance()->getSmallPtFont()->
-			getWidth(9,(*itor))) + 10.0f;
+			getWidth(9, "%s", (*itor))) + 10.0f;
 		if (width > textWidth_) textWidth_ = width;
 	}
 
 	float width = float(GLWFont::instance()->getSmallPtFont()->
-		getWidth(11,title_.c_str())) + 10.0f; 
+		getWidth(11, "%s", title_.c_str())) + 10.0f; 
 	if (width > textWidth_) textWidth_ = width;
 }
 
@@ -262,7 +262,7 @@
 
 	float pos = posY + posH - 16.0f;
 	GLWFont::instance()->getSmallPtFont()->drawA(selectedColor, alpha, 11, posX + 3.0f, 
-		pos, 0.0f, lastTip_->getTitle());
+		pos, 0.0f, "%s", lastTip_->getTitle());
 	pos -= 2.0f;
 
 	std::list &texts = lastTip_->getTexts();
@@ -273,6 +273,6 @@
 		pos -= 10.0f;
 
 		GLWFont::instance()->getSmallPtFont()->drawA(color, alpha, 9, posX + 6.0f, 
-			pos, 0.0f, (*itor));
+			pos, 0.0f, "%s", (*itor));
 	}
 }
Only in scorched/src/GLW: GLWToolTip.cpp~
diff -ur scorched.orig/src/GLW/GLWWindow.cpp scorched/src/GLW/GLWWindow.cpp
--- scorched.orig/src/GLW/GLWWindow.cpp	2005-06-13 10:24:36.000000000 +0200
+++ scorched/src/GLW/GLWWindow.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -457,7 +457,7 @@
 
 	// Desc
 	if (!node->getNamedChild("description", description_)) return false;
-	toolTip_.setText(name_.c_str(), description_.c_str());
+	toolTip_.setText(name_.c_str(), "%s", description_.c_str());
 
 	// Disabled
 	XMLNode *disabled = 0;
diff -ur scorched.orig/src/actions/Lightning.cpp scorched/src/actions/Lightning.cpp
--- scorched.orig/src/actions/Lightning.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/actions/Lightning.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -92,7 +92,7 @@
 			{
 				SoundBuffer *expSound =
 					Sound::instance()->fetchOrCreateBuffer(
-					(char *) getDataFile(weapon_->getSound()));
+					(char *) getDataFile("%s", weapon_->getSound()));
 				SoundUtils::playAbsoluteSound(VirtualSoundPriority::eAction,
 					expSound, position_);
 			}
diff -ur scorched.orig/src/actions/SoundAction.cpp scorched/src/actions/SoundAction.cpp
--- scorched.orig/src/actions/SoundAction.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/actions/SoundAction.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -45,7 +45,7 @@
 	{
 		SoundBuffer *activateSound = 
 			Sound::instance()->fetchOrCreateBuffer((char *)
-				getDataFile(weapon_->getSound()));
+				getDataFile("%s", weapon_->getSound()));
 		SoundUtils::playRelativeSound(VirtualSoundPriority::eAction,
 			activateSound);
 	}
diff -ur scorched.orig/src/actions/TankSay.cpp scorched/src/actions/TankSay.cpp
--- scorched.orig/src/actions/TankSay.cpp	2005-07-11 22:40:38.000000000 +0200
+++ scorched/src/actions/TankSay.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -70,7 +70,7 @@
 		}
 		else if (OptionsParam::instance()->getDedicatedServer())
 		{
-			Logger::log(text_.c_str());
+			Logger::log("%s", text_.c_str());
 		}
 	}
 }
diff -ur scorched.orig/src/actions/Teleport.cpp scorched/src/actions/Teleport.cpp
--- scorched.orig/src/actions/Teleport.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/actions/Teleport.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -77,7 +77,7 @@
 			{
 				SoundBuffer *activateSound = 
 					Sound::instance()->fetchOrCreateBuffer((char *)
-						getDataFile(weapon_->getSound()));
+						getDataFile("%s", weapon_->getSound()));
 				SoundUtils::playAbsoluteSound(VirtualSoundPriority::eAction,
 					activateSound, tank->getPhysics().getTankPosition());
 			}
diff -ur scorched.orig/src/boids/BoidWorld.cpp scorched/src/boids/BoidWorld.cpp
--- scorched.orig/src/boids/BoidWorld.cpp	2005-08-09 17:39:32.000000000 +0200
+++ scorched/src/boids/BoidWorld.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -123,7 +123,7 @@
 		const char *sound = (*itor).c_str();
 		SoundBuffer *buffer =
 			Sound::instance()->fetchOrCreateBuffer(
-				(char *) getDataFile(sound));
+				(char *) getDataFile("%s", sound));
 		sounds_.push_back(buffer);
 	}
 }
diff -ur scorched.orig/src/client/ClientMain.cpp scorched/src/client/ClientMain.cpp
--- scorched.orig/src/client/ClientMain.cpp	2005-07-19 23:45:36.000000000 +0200
+++ scorched/src/client/ClientMain.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -175,7 +175,8 @@
 	std::string errorString;
 	if (!GLConsoleFileReader::loadFileIntoConsole(getDataFile("data/autoexec.xml"), errorString))
 	{
-		dialogMessage("Failed to parse data/autoexec.xml", errorString.c_str());
+		dialogMessage("Failed to parse data/autoexec.xml", "%s",
+			errorString.c_str());
 		return false;
 	}
 	return true;
diff -ur scorched.orig/src/client/ClientTextHandler.cpp scorched/src/client/ClientTextHandler.cpp
--- scorched.orig/src/client/ClientTextHandler.cpp	2005-07-11 22:40:39.000000000 +0200
+++ scorched/src/client/ClientTextHandler.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -65,7 +65,7 @@
 		MessageDisplay::instance()->clear();
 		MessageDisplay::instance()->addMessage(message.getText());
 
-		Logger::log(message.getText());
+		Logger::log("%s", message.getText());
 	}
 	else
 	{
diff -ur scorched.orig/src/client/MessageDisplay.cpp scorched/src/client/MessageDisplay.cpp
--- scorched.orig/src/client/MessageDisplay.cpp	2005-08-16 22:23:59.000000000 +0200
+++ scorched/src/client/MessageDisplay.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -62,7 +62,7 @@
 			if (currentText_.size())
 			{
 				GLConsole::instance()->addLine(
-					false, currentText_.c_str());
+					false, "%s", currentText_.c_str());
 			}
 			currentText_ = texts_.front();
 			texts_.pop_front();
@@ -86,7 +86,7 @@
 	float wHeight = (float) GLViewPort::getHeight();
 	float wWidth = (float) GLViewPort::getWidth();
 	float textWidth = float(GLWFont::instance()->getLargePtFont()->getWidth(
-		30, currentText_.c_str()));
+		30, "%s", currentText_.c_str()));
 
 	float x = (wWidth/2.0f) - (textWidth / 2) - 10.0f;
 	float y = wHeight - 60.0f;
@@ -100,6 +100,6 @@
 	Vector white(0.9f, 0.9f, 1.0f);
 	GLWFont::instance()->getLargePtFont()->draw(
 		white, 30, 
-		x + 10.0f, y + 7.0f, 0.0f,
+		x + 10.0f, y + 7.0f, 0.0f,"%s",
 		currentText_.c_str());
 }
diff -ur scorched.orig/src/client/SpeedChange.cpp scorched/src/client/SpeedChange.cpp
--- scorched.orig/src/client/SpeedChange.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/client/SpeedChange.cpp	2006-02-11 15:23:32.000000000 +0100
@@ -61,7 +61,7 @@
 		snprintf(buffer, sizeof(buffer), "%.1fX", speed);
 
 		static Vector fontColor(0.7f, 0.7f, 0.2f);
-		GLWFont::instance()->getLargePtFont()->draw(fontColor, 20, 10.0f, 10.0f, 0.0f, buffer);
+		GLWFont::instance()->getLargePtFont()->draw(fontColor, 20, 10.0f, 10.0f, 0.0f, "%s", buffer);
 	}
 }
 
Only in scorched/src/client: SpeedChange.cpp~
diff -ur scorched.orig/src/client/TargetCamera.cpp scorched/src/client/TargetCamera.cpp
--- scorched.orig/src/client/TargetCamera.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/client/TargetCamera.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -149,7 +149,7 @@
 		for (int i=0; iaddLine(info.getMessage());
+	listView_->addLine("%s", info.getMessage());
 }
 
 void LogDialog::draw()
diff -ur scorched.orig/src/dialogs/ProgressDialog.cpp scorched/src/dialogs/ProgressDialog.cpp
--- scorched.orig/src/dialogs/ProgressDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/dialogs/ProgressDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -127,7 +127,7 @@
 
 			Vector color(0.2f, 0.2f, 0.2f);
 			GLWFont::instance()->getLargePtFont()->draw(color, 
-				14.0f, 20.0f, 33.0f, 0.0f, 
+				14.0f, 20.0f, 33.0f, 0.0f, "%s",
 				progressLabel_->getText());
 
 			HelpButtonDialog::instance()->getHelpTexture().draw();
@@ -148,10 +148,10 @@
 
 			Vector color2(0.4f, 0.4f, 0.4f);
 			GLWFont::instance()->getLargePtFont()->drawWidth(380, 
-				color2, 10.0f, 44.0f, 3.0f, 0.0f, 
+				color2, 10.0f, 44.0f, 3.0f, 0.0f, "%s",
 				tip1_.c_str());
 			GLWFont::instance()->getLargePtFont()->drawWidth(380, 
-				color2, 10.0f, 44.0f, -12.0f, 0.0f, 
+				color2, 10.0f, 44.0f, -12.0f, 0.0f, "%s",
 				tip2_.c_str());
 		glPopMatrix();
 	}
diff -ur scorched.orig/src/dialogs/RulesDialog.cpp scorched/src/dialogs/RulesDialog.cpp
--- scorched.orig/src/dialogs/RulesDialog.cpp	2005-06-27 02:55:48.000000000 +0200
+++ scorched/src/dialogs/RulesDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -74,7 +74,7 @@
 		while (found)
 		{
 			*found = '\0';
-			listView_->addLine(start);
+			listView_->addLine("%s", start);
 			start = found;
 			start++;
 
@@ -82,12 +82,12 @@
 		}
 		if (start[0] != '\0')
 		{
-			listView_->addLine(start);
+			listView_->addLine("%s", start);
 		}
 	}
 	else
 	{
-		listView_->addLine(text);
+		listView_->addLine("%s", text);
 	}
 }
 
diff -ur scorched.orig/src/dialogs/SaveDialog.cpp scorched/src/dialogs/SaveDialog.cpp
--- scorched.orig/src/dialogs/SaveDialog.cpp	2005-08-17 14:53:13.000000000 +0200
+++ scorched/src/dialogs/SaveDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -87,7 +87,7 @@
 		if (textBox_->getText()[0])
 		{
 			std::string saveFile = formatString("%s.s3d", textBox_->getText().c_str());
-			if (ClientSave::saveClient(getSaveFile(saveFile.c_str())))
+			if (ClientSave::saveClient(getSaveFile("%s", saveFile.c_str())))
 			{
 				Logger::log(LoggerInfo(LoggerInfo::TypePerformance,
 					formatString("Saved as \"%s\"", saveFile.c_str())));
diff -ur scorched.orig/src/dialogs/ScoreDialog.cpp scorched/src/dialogs/ScoreDialog.cpp
--- scorched.orig/src/dialogs/ScoreDialog.cpp	2005-06-02 01:09:32.000000000 +0200
+++ scorched/src/dialogs/ScoreDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -137,7 +137,7 @@
 			405,
 			white,
 			20,
-			x_ + 8.0f, y_ + h_ - 21.0f, 0.0f,
+			x_ + 8.0f, y_ + h_ - 21.0f, 0.0f, "%s",
 			ScorchedClient::instance()->getOptionsGame().getServerName());
 	}
 	else
@@ -165,11 +165,11 @@
 				moves);
 
 		int roundsWidth = GLWFont::instance()->getSmallPtFont()->getWidth(
-			10, rounds);
+			10, "%s", rounds);
 		GLWFont::instance()->getSmallPtFont()->draw(
 			white,
 			10,
-			x_ + 430 - roundsWidth, y_ + h_ - 40.0f, 0.0f,
+			x_ + 430 - roundsWidth, y_ + h_ - 40.0f, 0.0f, "%s",
 			rounds);
 	}
 
@@ -373,7 +373,7 @@
 		GLWFont::instance()->getSmallPtFont()->draw(
 			current->getColor(),
 			10,
-			textX + nameLeft, textY, 0.0f,
+			textX + nameLeft, textY, 0.0f, "%s",
 			name);
 		GLWFont::instance()->getSmallPtFont()->draw(
 			current->getColor(),
diff -ur scorched.orig/src/engine/ModFiles.cpp scorched/src/engine/ModFiles.cpp
--- scorched.orig/src/engine/ModFiles.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/engine/ModFiles.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -82,7 +82,7 @@
 {
 	{
 		// Get and check the user mod directory exists
-		const char *modDir = getModFile(mod);
+		const char *modDir = getModFile("%s", mod);
 		if (DefinesUtil::dirExists(modDir))
 		{
 			if (!loadModDir(modDir, mod)) return false;
@@ -95,7 +95,7 @@
 
 	{
 		// Get and check global mod directory
-		const char *modDir = getGlobalModFile(mod);
+		const char *modDir = getGlobalModFile("%s", mod);
 		if (DefinesUtil::dirExists(modDir))
 		{
 			if (!loadModDir(modDir, mod)) return false;
@@ -135,8 +135,8 @@
 			dialogMessage("Mod",
 				"Failed to find \"%s\" mod files in directories \"%s\" \"%s\"",
 				mod,
-				getModFile(mod),
-				getGlobalModFile(mod));
+				getModFile("%s", mod),
+				getGlobalModFile("%s", mod));
 			return false;
 		}
 	}
@@ -217,7 +217,7 @@
 
 bool ModFiles::writeModFiles(const char *mod)
 {
-	const char *modDir = getModFile(mod);
+	const char *modDir = getModFile("%s", mod);
 	if (!DefinesUtil::dirExists(modDir))
 	{
 		DefinesUtil::dirMake(modDir);
diff -ur scorched.orig/src/landscape/HeightMapLoader.cpp scorched/src/landscape/HeightMapLoader.cpp
--- scorched.orig/src/landscape/HeightMapLoader.cpp	2004-11-13 13:39:53.000000000 +0100
+++ scorched/src/landscape/HeightMapLoader.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -110,7 +110,7 @@
 		// Load the landscape
 		levelSurround = file->levelsurround;
 		GLBitmap bitmap;
-		const char *fileName = getDataFile(file->file.c_str());
+		const char *fileName = getDataFile("%s", file->file.c_str());
 		if (!bitmap.loadFromFile(fileName, false))
 		{
 			dialogMessage("HeightMapLoader",
diff -ur scorched.orig/src/landscape/HeightMapModifier.cpp scorched/src/landscape/HeightMapModifier.cpp
--- scorched.orig/src/landscape/HeightMapModifier.cpp	2005-08-15 12:22:29.000000000 +0200
+++ scorched/src/landscape/HeightMapModifier.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -185,7 +185,7 @@
 	// Check if we need to load a new mask
 	if (!defn.mask.empty())
 	{
-		const char *fileName = getDataFile(defn.mask.c_str());
+		const char *fileName = getDataFile("%s", defn.mask.c_str());
 		if (!maskMap.loadFromFile(fileName, false))
 		{
 			dialogExit("Landscape",
diff -ur scorched.orig/src/landscape/Landscape.cpp scorched/src/landscape/Landscape.cpp
--- scorched.orig/src/landscape/Landscape.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/landscape/Landscape.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -202,15 +202,15 @@
 		LandscapeTexTextureGenerate *generate = 
 			(LandscapeTexTextureGenerate *) tex->texture;
 
-		GLBitmap texture0(getDataFile(generate->texture0.c_str()));
-		GLBitmap texture1(getDataFile(generate->texture1.c_str()));
-		GLBitmap texture2(getDataFile(generate->texture2.c_str()));
-		GLBitmap texture3(getDataFile(generate->texture3.c_str()));
-		GLBitmap texture4(getDataFile(generate->texture4.c_str()));
-		GLBitmap bitmapShore(getDataFile(generate->shore.c_str()));
-		GLBitmap bitmapRock(getDataFile(generate->rockside.c_str()));
-		GLBitmap bitmapRoof(getDataFile(generate->roof.c_str()));
-		GLBitmap bitmapSurround(getDataFile(generate->surround.c_str()));
+		GLBitmap texture0(getDataFile("%s", generate->texture0.c_str()));
+		GLBitmap texture1(getDataFile("%s", generate->texture1.c_str()));
+		GLBitmap texture2(getDataFile("%s", generate->texture2.c_str()));
+		GLBitmap texture3(getDataFile("%s", generate->texture3.c_str()));
+		GLBitmap texture4(getDataFile("%s", generate->texture4.c_str()));
+		GLBitmap bitmapShore(getDataFile("%s", generate->shore.c_str()));
+		GLBitmap bitmapRock(getDataFile("%s", generate->rockside.c_str()));
+		GLBitmap bitmapRoof(getDataFile("%s", generate->roof.c_str()));
+		GLBitmap bitmapSurround(getDataFile("%s", generate->surround.c_str()));
 		GLBitmap *bitmaps[5];
 		bitmaps[0] = &texture0;
 		bitmaps[1] = &texture1;
@@ -268,26 +268,26 @@
 	// Generate the scorch map for the landscape
 	std::string sprayMaskFile = getDataFile("data/textures/smoke01.bmp");
 	GLBitmap sprayMaskBitmap(sprayMaskFile.c_str(), sprayMaskFile.c_str(), false);
-	scorchMap_.loadFromFile(getDataFile(tex->scorch.c_str()));
-	GLBitmap scorchMap(getDataFile(tex->scorch.c_str()));
+	scorchMap_.loadFromFile(getDataFile("%s", tex->scorch.c_str()));
+	GLBitmap scorchMap(getDataFile("%s", tex->scorch.c_str()));
 	scorchMap.resize(sprayMaskBitmap.getWidth(), sprayMaskBitmap.getHeight());
 	GLBitmap texture1New(sprayMaskBitmap.getWidth(), sprayMaskBitmap.getHeight(), true);
 	GLBitmapModifier::makeBitmapTransparent(texture1New, scorchMap, sprayMaskBitmap);
 	landTex1_.replace(texture1New, GL_RGBA);
 
 	// Magma
-	GLBitmap bitmapMagma(getDataFile(tex->magmasmall.c_str()));
+	GLBitmap bitmapMagma(getDataFile("%s", tex->magmasmall.c_str()));
 	DIALOG_ASSERT(magTexture_.replace(bitmapMagma));
 
 	// Sky
-	std::string ctex(getDataFile(tex->skytexture.c_str()));
-	std::string ctexm(getDataFile(tex->skytexturemask.c_str()));
+	std::string ctex(getDataFile("%s", tex->skytexture.c_str()));
+	std::string ctexm(getDataFile("%s", tex->skytexturemask.c_str()));
 	GLBitmap bitmapCloud(ctex.c_str(), ctexm.c_str(), false);
 	DIALOG_ASSERT(cloudTexture_.replace(bitmapCloud, GL_RGBA));
-	skyColorsMap_.loadFromFile(getDataFile(tex->skycolormap.c_str()));
+	skyColorsMap_.loadFromFile(getDataFile("%s", tex->skycolormap.c_str()));
 
 	// Detail
-	GLBitmap bitmapDetail(getDataFile(tex->detail.c_str()));
+	GLBitmap bitmapDetail(getDataFile("%s", tex->detail.c_str()));
 	DIALOG_ASSERT(detailTexture_.replace(bitmapDetail, GL_RGB, true));
 
 	// Create the plan textures (for the plan and wind dialogs)
diff -ur scorched.orig/src/landscape/LandscapeDefn.cpp scorched/src/landscape/LandscapeDefn.cpp
--- scorched.orig/src/landscape/LandscapeDefn.cpp	2005-01-17 22:39:35.000000000 +0100
+++ scorched/src/landscape/LandscapeDefn.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -104,7 +104,7 @@
 		startmask)) return false;
 	if (!startmask.empty())
 	{
-		if (!checkDataFile(startmask.c_str())) return false;
+		if (!checkDataFile("%s", startmask.c_str())) return false;
 	}
 	return node->failChildren();
 }
@@ -113,7 +113,7 @@
 {
 	if (!node->getNamedChild("file", file)) return false;
 	if (!node->getNamedChild("levelsurround", levelsurround)) return false;
-	if (!checkDataFile(file.c_str())) return false;
+	if (!checkDataFile("%s", file.c_str())) return false;
 	return node->failChildren();
 }
 
@@ -137,7 +137,7 @@
 
 	if (!mask.empty())
 	{
-		if (!checkDataFile(mask.c_str())) return false;
+		if (!checkDataFile("%s", mask.c_str())) return false;
 	}
 	return node->failChildren();
 }
diff -ur scorched.orig/src/landscape/LandscapeObjectsPlacement.cpp scorched/src/landscape/LandscapeObjectsPlacement.cpp
--- scorched.orig/src/landscape/LandscapeObjectsPlacement.cpp	2005-07-18 00:27:13.000000000 +0200
+++ scorched/src/landscape/LandscapeObjectsPlacement.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -298,7 +298,7 @@
 			placement.objecttype.c_str());
 	}
 
-	GLBitmap map(getDataFile(placement.mask.c_str()));
+	GLBitmap map(getDataFile("%s", placement.mask.c_str()));
 	if (!map.getBits())
 	{
 		dialogExit("LandscapeObjectPlacementMask",
diff -ur scorched.orig/src/landscape/LandscapeSoundManager.cpp scorched/src/landscape/LandscapeSoundManager.cpp
--- scorched.orig/src/landscape/LandscapeSoundManager.cpp	2005-07-13 14:51:49.000000000 +0200
+++ scorched/src/landscape/LandscapeSoundManager.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -67,7 +67,7 @@
 			entry.soundType = (*typeItor);
 			entry.soundBuffer = 
 				Sound::instance()->fetchOrCreateBuffer((char *)
-					getDataFile(entry.soundType->sound.c_str()));
+					getDataFile("%s", entry.soundType->sound.c_str()));
 			entry.timeLeft = entry.soundType->timing->getNextEventTime();
 			entry.soundSource = new VirtualSoundSource(
 				VirtualSoundPriority::eEnvironment, (entry.timeLeft < 0.0f), false);
diff -ur scorched.orig/src/landscape/LandscapeTex.cpp scorched/src/landscape/LandscapeTex.cpp
--- scorched.orig/src/landscape/LandscapeTex.cpp	2005-08-02 19:27:44.000000000 +0200
+++ scorched/src/landscape/LandscapeTex.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -164,7 +164,7 @@
 	if (!soundsNode->getNamedChild("volume", soundvolume)) return false;
 	while (soundsNode->getNamedChild("sound", sound, false))
 	{
-		if (!checkDataFile(sound.c_str())) return false;
+		if (!checkDataFile("%s", sound.c_str())) return false;
 		sounds.push_back(sound);
 	}
 	if (!soundsNode->failChildren()) return false;
@@ -181,10 +181,10 @@
 	if (!node->getNamedChild("wavetexture1", wavetexture1)) return false;
 	if (!node->getNamedChild("wavetexture2", wavetexture2)) return false;
 	if (!node->getNamedChild("height", height)) return false;
-	if (!checkDataFile(reflection.c_str())) return false;
-	if (!checkDataFile(texture.c_str())) return false;
-	if (!checkDataFile(wavetexture1.c_str())) return false;
-	if (!checkDataFile(wavetexture2.c_str())) return false;
+	if (!checkDataFile("%s", reflection.c_str())) return false;
+	if (!checkDataFile("%s", texture.c_str())) return false;
+	if (!checkDataFile("%s", wavetexture1.c_str())) return false;
+	if (!checkDataFile("%s", wavetexture2.c_str())) return false;
 	return node->failChildren();
 }
 
@@ -200,15 +200,15 @@
 	if (!node->getNamedChild("texture2", texture2)) return false;
 	if (!node->getNamedChild("texture3", texture3)) return false;
 	if (!node->getNamedChild("texture4", texture4)) return false;
-	if (!checkDataFile(surround.c_str())) return false;
-	if (!checkDataFile(roof.c_str())) return false;
-	if (!checkDataFile(rockside.c_str())) return false;
-	if (!checkDataFile(shore.c_str())) return false;
-	if (!checkDataFile(texture0.c_str())) return false;
-	if (!checkDataFile(texture1.c_str())) return false;
-	if (!checkDataFile(texture2.c_str())) return false;
-	if (!checkDataFile(texture3.c_str())) return false;
-	if (!checkDataFile(texture4.c_str())) return false;
+	if (!checkDataFile("%s", surround.c_str())) return false;
+	if (!checkDataFile("%s", roof.c_str())) return false;
+	if (!checkDataFile("%s", rockside.c_str())) return false;
+	if (!checkDataFile("%s", shore.c_str())) return false;
+	if (!checkDataFile("%s", texture0.c_str())) return false;
+	if (!checkDataFile("%s", texture1.c_str())) return false;
+	if (!checkDataFile("%s", texture2.c_str())) return false;
+	if (!checkDataFile("%s", texture3.c_str())) return false;
+	if (!checkDataFile("%s", texture4.c_str())) return false;
 	return node->failChildren();
 }
 
@@ -253,12 +253,12 @@
 	if (!node->getNamedChild("skydiffuse", skydiffuse)) return false;
 	if (!node->getNamedChild("skyambience", skyambience)) return false;
 
-	if (!checkDataFile(detail.c_str())) return false;
-	if (!checkDataFile(magmasmall.c_str())) return false;
-	if (!checkDataFile(scorch.c_str())) return false;
-	if (!checkDataFile(skytexture.c_str())) return false;
-	if (!checkDataFile(skytexturemask.c_str())) return false;
-	if (!checkDataFile(skycolormap.c_str())) return false;
+	if (!checkDataFile("%s", detail.c_str())) return false;
+	if (!checkDataFile("%s", magmasmall.c_str())) return false;
+	if (!checkDataFile("%s", scorch.c_str())) return false;
+	if (!checkDataFile("%s", skytexture.c_str())) return false;
+	if (!checkDataFile("%s", skytexturemask.c_str())) return false;
+	if (!checkDataFile("%s", skycolormap.c_str())) return false;
 
 	{
 		XMLNode *placementsNode;
diff -ur scorched.orig/src/landscape/Water.cpp scorched/src/landscape/Water.cpp
--- scorched.orig/src/landscape/Water.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/landscape/Water.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -113,23 +113,23 @@
 		height_ = water->height;
 
 		waterOn_ = true;
-		const char *wave1 = getDataFile(
+		const char *wave1 = getDataFile("%s",
 			water->wavetexture1.c_str());
 		GLBitmap waves1Map(wave1, wave1, false);
-		const char *wave2 = getDataFile(
+		const char *wave2 = getDataFile("%s",
 			water->wavetexture2.c_str());
 		GLBitmap waves2Map(wave2, wave2, false);
 		wWaves_.getWavesTexture1().replace(waves1Map, GL_RGBA);
 		wWaves_.getWavesTexture2().replace(waves2Map, GL_RGBA);
-		bitmapWater_.loadFromFile(getDataFile(water->reflection.c_str()), false);
-		GLBitmap bitmapWaterDetail(getDataFile(water->texture.c_str()));
+		bitmapWater_.loadFromFile(getDataFile("%s", water->reflection.c_str()), false);
+		GLBitmap bitmapWaterDetail(getDataFile("%s", water->texture.c_str()));
 		wMap_.getWaterDetail().replace(bitmapWaterDetail, GL_RGB, true);
 		wWaves_.getWavesColor() = water->wavecolor;
 
 		// Generate the water texture for the spray sprite
 		std::string sprayMaskFile = getDataFile("data/textures/smoke01.bmp");
 		GLBitmap sprayMaskBitmap(sprayMaskFile.c_str(), sprayMaskFile.c_str(), false);
-		GLBitmap bitmapWater(getDataFile(water->reflection.c_str()));
+		GLBitmap bitmapWater(getDataFile("%s", water->reflection.c_str()));
 		bitmapWater.resize(
 			sprayMaskBitmap.getWidth(), sprayMaskBitmap.getHeight());
 		GLBitmap textureWaterNew(
Only in scorched/src/ode: error.cpp.orig
diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
--- scorched.orig/src/scorched/MainDialog.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-11 15:18:07.000000000 +0100
@@ -171,7 +171,7 @@
 {
 	wxButton *button = 0;
 	wxBitmap bitmap;
-	const char *bitmapFile = getDataFile(bitmapName);
+	const char *bitmapFile = getDataFile("%s", bitmapName);
 	if (bitmap.LoadFile(wxString(bitmapFile, wxConvUTF8), wxBITMAP_TYPE_BMP) &&
 		bitmap.Ok())
 	{
Only in scorched/src/scorched: MainDialog.cpp~
diff -ur scorched.orig/src/scorched/NetDialog.cpp scorched/src/scorched/NetDialog.cpp
--- scorched.orig/src/scorched/NetDialog.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/scorched/NetDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -510,7 +510,7 @@
 			strcat(buffer, " -username ");
 			strcat(buffer, username.mb_str(wxConvUTF8));
 		}
-		runScorched3D(buffer);
+		runScorched3D("%s", buffer);
 	}
 	return false;
 }
diff -ur scorched.orig/src/scorched/ServerDialog.cpp scorched/src/scorched/ServerDialog.cpp
--- scorched.orig/src/scorched/ServerDialog.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/scorched/ServerDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -573,7 +573,7 @@
 	{
 		Logger::log( "Says \"%s\"", 
 			entryDialog.GetValue().GetData());
-		ServerCommon::sendString(0, entryDialog.GetValue().mb_str(wxConvUTF8));
+		ServerCommon::sendString(0, "%s", entryDialog.GetValue().mb_str(wxConvUTF8));
 	}
 }
 
@@ -600,7 +600,7 @@
 				if (!tank->getTankAI())
 				{
 					ServerCommon::sendString(tank->getDestinationId(), 
-						entryDialog.GetValue().mb_str(wxConvUTF8));
+						"%s", entryDialog.GetValue().mb_str(wxConvUTF8));
 				}
 			}
 		}
diff -ur scorched.orig/src/scorched/SingleChoiceDialog.cpp scorched/src/scorched/SingleChoiceDialog.cpp
--- scorched.orig/src/scorched/SingleChoiceDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/SingleChoiceDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -106,7 +106,7 @@
 		char *desc = (char *) entry.description.c_str();
 
 		wxObjectRefData *refData = new SingleChoiceFrameData(
-			getDataFile(entry.gamefile.c_str()));
+			getDataFile("%s", entry.gamefile.c_str()));
 		addButtonToWindow(useId++, 
 			desc, icon, 
 			this, gridsizer, refData);
Only in scorched/src/scorched: SingleChoiceDialog.cpp.orig
diff -ur scorched.orig/src/scorched/SingleGames.cpp scorched/src/scorched/SingleGames.cpp
--- scorched.orig/src/scorched/SingleGames.cpp	2004-11-25 21:19:34.000000000 +0100
+++ scorched/src/scorched/SingleGames.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -56,7 +56,7 @@
 	if (!mainNode->getNamedChild("description", description)) return false;
 	if (!mainNode->getNamedChild("icon", icon)) return false;
 	if (!mainNode->getNamedChild("url", url)) return false;
-	if (!checkDataFile(icon.c_str())) return false;
+	if (!checkDataFile("%s", icon.c_str())) return false;
 
 	XMLNode *gameNode = 0;
 	while (file.getRootNode()->getNamedChild("game", gameNode, false))
@@ -65,8 +65,8 @@
 		if (!gameNode->getNamedChild("description", entry.description)) return false;
 		if (!gameNode->getNamedChild("icon", entry.icon)) return false;
 		if (!gameNode->getNamedChild("gamefile", entry.gamefile)) return false;
-		if (!checkDataFile(entry.icon.c_str())) return false;
-		if (!checkDataFile(entry.gamefile.c_str())) return false;
+		if (!checkDataFile("%s", entry.icon.c_str())) return false;
+		if (!checkDataFile("%s", entry.gamefile.c_str())) return false;
 		if (!gameNode->failChildren()) return false;
 		entries.push_back(entry);
 	}
diff -ur scorched.orig/src/scorched/main.cpp scorched/src/scorched/main.cpp
--- scorched.orig/src/scorched/main.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/scorched/main.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -100,7 +100,7 @@
 			itor++)
 		{
 			const char *modDir = (*itor).c_str();
-			std::string src = getModFile(modDir);
+			std::string src = getModFile("%s", modDir);
 			std::string dest = getSettingsFile("/oldmods/%s-%u", modDir, time(0));
 			if (DefinesUtil::dirExists(src.c_str()))
 			{
Only in scorched/src/scorched: main.cpp~
diff -ur scorched.orig/src/server/ServerAdminHandler.cpp scorched/src/server/ServerAdminHandler.cpp
--- scorched.orig/src/server/ServerAdminHandler.cpp	2005-06-20 02:35:08.000000000 +0200
+++ scorched/src/server/ServerAdminHandler.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -142,7 +142,7 @@
 			result +=
 				"-----------------------------------------------------\n";
 
-			ServerCommon::sendString(destinationId, result.c_str());
+			ServerCommon::sendString(destinationId, "%s", result.c_str());
 		}
 		break;
 	case ComsAdminMessage::AdminLogout:
@@ -193,7 +193,7 @@
 			result +=
 				"-----------------------------------------------------\n";
 
-			ServerCommon::sendString(destinationId, result.c_str());
+			ServerCommon::sendString(destinationId, "%s", result.c_str());
 		}
 		break;
 	case ComsAdminMessage::AdminShowAliases:
@@ -221,7 +221,7 @@
 				result +=
 					"-----------------------------------------------------\n";
 
-				ServerCommon::sendString(destinationId, result.c_str());
+				ServerCommon::sendString(destinationId, "%s", result.c_str());
 			}
 			else ServerCommon::sendString(destinationId, "Unknown player for showaliases");
 		}
@@ -251,7 +251,7 @@
 				result +=
 					"-----------------------------------------------------\n";
 
-				ServerCommon::sendString(destinationId, result.c_str());
+				ServerCommon::sendString(destinationId, "%s", result.c_str());
 			}
 			else ServerCommon::sendString(destinationId, "Unknown player for showipaliases");
 		}
@@ -391,21 +391,21 @@
 			adminTank->getName(),
 			message.getParam1());
 
-		ServerCommon::sendString(0, message.getParam1());
+		ServerCommon::sendString(0, "%s", message.getParam1());
 		break;
 	case ComsAdminMessage::AdminAdminTalk:
 		ServerCommon::serverLog(0,
 			"\"%s\" admin admintalk \"%s\"",
 			adminTank->getName(),
 			message.getParam1());
-		ServerCommon::sendStringAdmin(message.getParam1());
+		ServerCommon::sendStringAdmin("%s", message.getParam1());
 		break;
 	case ComsAdminMessage::AdminMessage:
 		ServerCommon::serverLog(0,
 			"\"%s\" admin message \"%s\"",
 			adminTank->getName(),
 			message.getParam1());
-		ServerCommon::sendStringMessage(0, message.getParam1());
+		ServerCommon::sendStringMessage(0, "%s", message.getParam1());
 		break;
 	case ComsAdminMessage::AdminKillAll:
 		ServerCommon::serverLog(0,
diff -ur scorched.orig/src/server/ServerCommon.cpp scorched/src/server/ServerCommon.cpp
--- scorched.orig/src/server/ServerCommon.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/server/ServerCommon.cpp	2006-02-11 15:23:57.000000000 +0100
@@ -298,6 +298,6 @@
 		vsnprintf(text, sizeof(text), fmt, ap);
 		va_end(ap);
 
-		Logger::log(text);
+		Logger::log("%s", text);
 	}
 }
Only in scorched/src/server: ServerCommon.cpp~
diff -ur scorched.orig/src/server/ServerNewGameState.cpp scorched/src/server/ServerNewGameState.cpp
--- scorched.orig/src/server/ServerNewGameState.cpp	2005-08-10 14:39:31.000000000 +0200
+++ scorched/src/server/ServerNewGameState.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -296,7 +296,7 @@
 		tankCloseness = height->startcloseness;
 		if (!height->startmask.empty())
 		{
-			tankMask.loadFromFile(getDataFile(height->startmask.c_str()));
+			tankMask.loadFromFile(getDataFile("%s", height->startmask.c_str()));
 			DIALOG_ASSERT(tankMask.getBits());
 		}
 	}
diff -ur scorched.orig/src/server/ServerTimedMessage.cpp scorched/src/server/ServerTimedMessage.cpp
--- scorched.orig/src/server/ServerTimedMessage.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/server/ServerTimedMessage.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -61,6 +61,12 @@
 			entry.lastTime = currentTime;
 			
 			std::string message = entry.messages.front();
+ 			/* Note message.c_str() is a user supplied printf format string
+			   with possible a conversion specifier to display the ctime.
+			   Since these messages are loaded from a local file this is
+			   reasonable safe, although it would be better to just
+			   always prefix times-messages with the ctime and to not
+			   interpreted user supplied data this way. */
 			ServerCommon::sendString(0, message.c_str(), ctime(¤tTime));
 			Logger::log(message.c_str(), ctime(¤tTime));
 			entry.messages.pop_front();
diff -ur scorched.orig/src/server/ServerWebHandler.cpp scorched/src/server/ServerWebHandler.cpp
--- scorched.orig/src/server/ServerWebHandler.cpp	2005-08-14 21:11:42.000000000 +0200
+++ scorched/src/server/ServerWebHandler.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -312,17 +312,17 @@
 		const char *type = getField(fields, "type");
 		if (!type || 0 == strcmp(type, "all"))
 		{
-			ServerCommon::sendString(0, say);
+			ServerCommon::sendString(0, "%s", say);
 			ServerCommon::serverLog(0, "Says : %s", say);
 		}
 		else if (0 == strcmp(type, "message"))
 		{
-			ServerCommon::sendStringMessage(0, say);
+			ServerCommon::sendStringMessage(0, "%s", say);
 			ServerCommon::serverLog(0, "Messages : %s", say);
 		}
 		else if (0 == strcmp(type, "admin"))
 		{
-			ServerCommon::sendStringAdmin(say);
+			ServerCommon::sendStringAdmin("%s", say);
 			ServerCommon::serverLog(0, "Admins Says : %s", say);
 		}
 	}
diff -ur scorched.orig/src/sound/Sound.cpp scorched/src/sound/Sound.cpp
--- scorched.orig/src/sound/Sound.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/sound/Sound.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -118,19 +118,19 @@
 	alDistanceModel(AL_INVERSE_DISTANCE);
 
 	GLConsole::instance()->addLine(false, "AL_VENDOR:");
-	GLConsole::instance()->addLine(false, 
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_VENDOR)));
 	GLConsole::instance()->addLine(false, "AL_VERSION:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_VERSION)));
 	GLConsole::instance()->addLine(false, "AL_RENDERER:");
-	GLConsole::instance()->addLine(false, 
+	GLConsole::instance()->addLine(false, "%s", 
 		checkString((char *) alGetString(AL_RENDERER)));
 	GLConsole::instance()->addLine(false, "AL_EXTENSIONS:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_EXTENSIONS)));
 	GLConsole::instance()->addLine(false, "ALC_DEVICE_SPECIFIER:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alcGetString(soundDevice, ALC_DEVICE_SPECIFIER)));
 
 	// Create all sound channels
diff -ur scorched.orig/src/sprites/ExplosionLaserBeamRenderer.cpp scorched/src/sprites/ExplosionLaserBeamRenderer.cpp
--- scorched.orig/src/sprites/ExplosionLaserBeamRenderer.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/sprites/ExplosionLaserBeamRenderer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -49,7 +49,7 @@
 	{
 		SoundBuffer *firedSound = 
 			Sound::instance()->fetchOrCreateBuffer( (char*)
-				getDataFile(data));
+				getDataFile("%s", data));
 		SoundUtils::playAbsoluteSound(VirtualSoundPriority::eAction,
 			firedSound, position);
 	}
diff -ur scorched.orig/src/sprites/ExplosionTextures.cpp scorched/src/sprites/ExplosionTextures.cpp
--- scorched.orig/src/sprites/ExplosionTextures.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/sprites/ExplosionTextures.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -193,7 +193,7 @@
 			return *(*findItor).second;
 		}
 
-		const char *fileName = getDataFile(name);
+		const char *fileName = getDataFile("%s", name);
 		if (DefinesUtil::fileExists(fileName))
 		{
 			GLBitmap *map = new GLBitmap;
diff -ur scorched.orig/src/sprites/MissileActionRenderer.cpp scorched/src/sprites/MissileActionRenderer.cpp
--- scorched.orig/src/sprites/MissileActionRenderer.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/sprites/MissileActionRenderer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -92,7 +92,7 @@
 		if (0 != strcmp("none", engineSound))
 		{
 			SoundBuffer *rocket = Sound::instance()->fetchOrCreateBuffer(
-				(char *) getDataFile(engineSound));
+				(char *) getDataFile("%s", engineSound));
 			sound_ = new VirtualSoundSource(VirtualSoundPriority::eMissile, true, false);
 			sound_->setPosition(shot->getCurrentPosition());
 			sound_->setGain(0.25f);
diff -ur scorched.orig/src/sprites/TextActionRenderer.cpp scorched/src/sprites/TextActionRenderer.cpp
--- scorched.orig/src/sprites/TextActionRenderer.cpp	2004-02-25 01:49:49.000000000 +0100
+++ scorched/src/sprites/TextActionRenderer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -55,7 +55,7 @@
 	GLState currentState(GLState::DEPTH_ON | GLState::TEXTURE_ON);
 	glDepthMask(GL_FALSE);
 	GLWFont::instance()->getSmallPtFont()->drawBilboard(color_, 1.0f, 
-		position_[0], position_[1], position_[2],
+		position_[0], position_[1], position_[2], "%s",
 		text_.c_str());
 
 	glDepthMask(GL_TRUE);
diff -ur scorched.orig/src/tankgraph/GLWTankViewer.cpp scorched/src/tankgraph/GLWTankViewer.cpp
--- scorched.orig/src/tankgraph/GLWTankViewer.cpp	2005-06-04 03:56:53.000000000 +0200
+++ scorched/src/tankgraph/GLWTankViewer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -215,6 +215,7 @@
 				{
 					toolTip_.setText(
 						"Model",
+						"%s",
 						models_[vectorPos]->getId().getModelName());			
 				}
 
@@ -293,7 +294,7 @@
 	Vector color(0.3f, 0.3f, 0.3f);
 	GLWFont::instance()->getSmallPtFont()->
 		drawWidth(int(TankSquareSize * 2 + TankPadding), 
-			color, 10.0f, -70.0f, 75.0f, 0.0f, 
+			color, 10.0f, -70.0f, 75.0f, 0.0f, "%s",
 			models_[pos]->getId().getModelName());
 	GLWFont::instance()->getSmallPtFont()->
 		drawWidth(int(TankSquareSize * 2 + TankPadding), 
diff -ur scorched.orig/src/tankgraph/TankMenus.cpp scorched/src/tankgraph/TankMenus.cpp
--- scorched.orig/src/tankgraph/TankMenus.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/tankgraph/TankMenus.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -197,7 +197,7 @@
 			currentTank == tank?'>':' ',
 			description,
 			tank->getName(), modelId.getModelName());
-		GLConsole::instance()->addLine(false, buffer);
+		GLConsole::instance()->addLine(false, "%s", buffer);
 	}
 
 	GLConsole::instance()->addLine(false,
diff -ur scorched.orig/src/tankgraph/TankModelRenderer.cpp scorched/src/tankgraph/TankModelRenderer.cpp
--- scorched.orig/src/tankgraph/TankModelRenderer.cpp	2005-07-19 23:45:37.000000000 +0200
+++ scorched/src/tankgraph/TankModelRenderer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -170,14 +170,14 @@
 	{
 		Vector &bilX = GLCameraFrustum::instance()->getBilboardVectorX(); 
 		bilX *= 0.5f * (float) GLWFont::instance()->getSmallPtFont()->getWidth(
-			1, tank_->getName());
+			1, "%s", tank_->getName());
 
 		glDepthMask(GL_FALSE);
 		GLWFont::instance()->getSmallPtFont()->drawBilboard(
 			tank_->getColor(), 1,
 			(float) tank_->getPhysics().getTankPosition()[0] - bilX[0], 
 			(float) tank_->getPhysics().getTankPosition()[1] - bilX[1], 
-			(float) height + 8.0f,
+			(float) height + 8.0f, "%s",
 			tank_->getName());
 		glDepthMask(GL_TRUE);
 	}
@@ -188,7 +188,7 @@
 		if (OptionsDisplay::instance()->getDrawPlayerNames())
 		{
 			bilX *= 0.5f * (float) GLWFont::instance()->getSmallPtFont()->getWidth(
-				1, tank_->getName());
+				1, "%s", tank_->getName());
 			bilX += bilX.Normalize() * 1.0f;
 		}
 		else
@@ -633,11 +633,11 @@
 			GLWFont::instance()->getSmallPtFont()->draw(
 				yellow, 10,
 				(float) posX_ + 47.0f, (float) posY_ - 4.0f, (float) posZ_,
-				TankModelRendererHUD::getTextA());
+				"%s", TankModelRendererHUD::getTextA());
 			GLWFont::instance()->getSmallPtFont()->draw(
 				yellow, 10,
 				(float) posX_ + 47.0f, (float) posY_ - 15.0f, (float) posZ_,
-				TankModelRendererHUD::getTextB());
+				"%s", TankModelRendererHUD::getTextB());
 
 			if (TankModelRendererHUD::getPercentage() >= 0.0f)
 			{
diff -ur scorched.orig/src/weapons/Accessory.cpp scorched/src/weapons/Accessory.cpp
--- scorched.orig/src/weapons/Accessory.cpp	2005-06-11 18:53:41.000000000 +0200
+++ scorched/src/weapons/Accessory.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -65,7 +65,7 @@
 
 	// Get the accessory description
 	accessoryNode->getNamedChild("description", description_, false);
-	toolTip_.setText(getName(), getDescription());
+	toolTip_.setText(getName(), "%s", getDescription());
 
 	// Get the accessory icon
 	if (accessoryNode->getNamedChild("icon", iconName_, false))

scorched3d-negint.patch:

--- NEW FILE scorched3d-negint.patch ---
--- scorched.orig/src/server/ServerConnectHandler.cpp.negint	2006-02-11 16:54:09.000000000 +0100
+++ scorched.orig/src/server/ServerConnectHandler.cpp	2006-02-11 16:58:06.000000000 +0100
@@ -121,9 +121,9 @@
 	}
 
 	// Check player availability
-	if ((int) message.getNoPlayers() > 
+	if (message.getNoPlayers() > (unsigned int)(
 		ScorchedServer::instance()->getOptionsGame().getNoMaxPlayers() -
-		ScorchedServer::instance()->getTankContainer().getNoOfTanks())
+		ScorchedServer::instance()->getTankContainer().getNoOfTanks()))
 	{
 		ServerCommon::sendString(destinationId, 
 			"--------------------------------------------------\n"

scorched3d-pgsql.patch:

--- NEW FILE scorched3d-pgsql.patch ---
diff -ur scorched.orig/src/common/StatsLoggerPGSQL.cpp scorched/src/common/StatsLoggerPGSQL.cpp
--- scorched.orig/src/common/StatsLoggerPGSQL.cpp	2005-03-22 18:45:49.000000000 +0100
+++ scorched/src/common/StatsLoggerPGSQL.cpp	2006-02-10 11:50:42.000000000 +0100
@@ -72,8 +72,8 @@
     int sqlLen = vsnprintf(text, SQL_BUFFER_SIZE, fmt, ap);
     va_end(ap);
 
-    if(sqlLen >= SQL_BUFFER_SIZE) {
-        Logger::log(0, "pgsql: Query failed, too long.\n");
+    if(sqlLen >= SQL_BUFFER_SIZE || sqlLen < 0) {
+        Logger::log("pgsql: Query failed, too long.\n");
         return false;
     }
 
@@ -113,15 +113,15 @@
                         passwd.c_str());
                 if (pgsql_ && PQstatus(pgsql_) == CONNECTION_OK)
                 {
-                    Logger::log(0, "pgsql stats logger started");
+                    Logger::log("pgsql stats logger started");
                 }
                 else
                 {
                     success_ = false;
-                    Logger::log(0, "pgsql stats logger failed to start. "
+                    Logger::log("pgsql stats logger failed to start. "
                             "Error: %s",
                             PQerrorMessage(pgsql_));
-                    Logger::log(0, "pgsql params : host %s, user %s, passwd %s, db %s",
+                    Logger::log("pgsql params : host %s, user %s, passwd %s, db %s",
                             host.c_str(), user.c_str(),
                             passwd.c_str(), db.c_str());
                     if(pgsql_) {
@@ -133,13 +133,13 @@
             else
             {
                 success_ = false;
-                Logger::log(0, "Failed to parse %s settings file.", fileName);
+                Logger::log("Failed to parse %s settings file.", fileName);
             }
         }
         else
         {	
             success_ = false;
-            Logger::log(0, "Failed to parse %s settings file. Error: %s", 
+            Logger::log("Failed to parse %s settings file. Error: %s", 
                     fileName,
                     file.getParserError());
         }
@@ -618,11 +618,11 @@
         if(lastresult_ && PQntuples(lastresult_) > 0) {
             playerId = atoi(PQgetvalue(lastresult_,0,0));
         }
-        Logger::log(0, "Add new stats user \"%i\"", playerId);
+        Logger::log("Add new stats user \"%i\"", playerId);
     }
     else
     {
-        Logger::log(0, "Found stats user \"%i\"", playerId);
+        Logger::log("Found stats user \"%i\"", playerId);
     }
 
     // Store this new player id

scorched3d-sprintf.patch:

--- NEW FILE scorched3d-sprintf.patch ---
diff -ur scorched.orig/src/3dsparse/MSModelFactory.cpp scorched/src/3dsparse/MSModelFactory.cpp
--- scorched.orig/src/3dsparse/MSModelFactory.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/3dsparse/MSModelFactory.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -278,7 +278,8 @@
 		if (sscanf(buffer, "%s", textureName) != 1)
 			returnError(fileName, "No material texture format");
 		textureName[strlen(textureName)-1] = '\0';
-		sprintf(fullTextureName, "%s/%s", filePath, &textureName[1]);
+		snprintf(fullTextureName, sizeof(fullTextureName), "%s/%s",
+			filePath, &textureName[1]);
 		while (sep=strchr(fullTextureName, '\\')) *sep = '/';
 
 		// alphamap
@@ -289,7 +290,8 @@
 		if (sscanf(buffer, "%s", textureNameAlpha) != 1)
 			returnError(fileName, "No material alpha texture format");
 		textureNameAlpha[strlen(textureNameAlpha)-1] = '\0';
-		sprintf(fullTextureAlphaName, "%s/%s", filePath, &textureNameAlpha[1]);
+		snprintf(fullTextureAlphaName, sizeof(fullTextureAlphaName),
+			"%s/%s", filePath, &textureNameAlpha[1]);
 		while (sep=strchr(fullTextureAlphaName, '\\')) *sep = '/';
 
 		int modelIndex = 0;
diff -ur scorched.orig/src/3dsparse/ModelID.cpp scorched/src/3dsparse/ModelID.cpp
--- scorched.orig/src/3dsparse/ModelID.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/3dsparse/ModelID.cpp	2006-02-11 15:10:00.000000000 +0100
@@ -75,7 +75,8 @@
 		if (!modelNode->getNamedChild("mesh", meshNode)) return false;
 		const char *meshNameContent = meshNode->getContent();
 		static char meshName[1024];
-		sprintf(meshName, "%s/%s", directory, meshNameContent);
+		snprintf(meshName, sizeof(meshName), "%s/%s", directory,
+			meshNameContent);
 		if (!DefinesUtil::fileExists(getDataFile(meshName)))
 		{
 			dialogMessage("Scorched Models",
@@ -89,7 +90,8 @@
 		static char skinName[1024];
 		if (strcmp(skinNameContent, "none") != 0)
 		{
-			sprintf(skinName, "%s/%s", directory, skinNameContent);
+			snprintf(skinName, sizeof(skinName), "%s/%s",
+				directory, skinNameContent);
 			if (!DefinesUtil::fileExists(getDataFile(skinName)))
 			{
 				dialogMessage("Scorched Models",
@@ -100,7 +102,8 @@
 		}
 		else
 		{
-			sprintf(skinName, "%s", skinNameContent);
+			snprintf(skinName, sizeof(skinName), "%s",
+				skinNameContent);
 		}
 
 		meshName_ = meshName;
@@ -110,7 +113,8 @@
 	{
 		const char *meshNameContent = modelNode->getContent();
 		static char meshName[1024];
-		sprintf(meshName, "%s/%s", directory, meshNameContent);
+		snprintf(meshName, sizeof(meshName), "%s/%s", directory,
+			meshNameContent);
 
 		if (!DefinesUtil::fileExists(getDataFile(meshName)))
 		{
Only in scorched/src/3dsparse: ModelID.cpp~
diff -ur scorched.orig/src/3dsparse/aseFile.tab.cpp scorched/src/3dsparse/aseFile.tab.cpp
--- scorched.orig/src/3dsparse/aseFile.tab.cpp	2005-04-12 00:19:08.000000000 +0200
+++ scorched/src/3dsparse/aseFile.tab.cpp	2006-02-11 15:10:46.000000000 +0100
@@ -1056,7 +1056,7 @@
 int aseerror(const char *errmsg)
 {
 	char buffer[1024];
-	sprintf(buffer, "%i:%s\n", aselineno, errmsg);
+	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, errmsg);
 	dialogMessage("Lexer", buffer);
     return 0;
 }
@@ -1064,7 +1064,7 @@
 int asewarning(const char *warningmsg)
 {
 	char buffer[1024];
-	sprintf(buffer, "%i:%s\n", aselineno, warningmsg);
+	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, warningmsg);
 	dialogMessage("Lexer", buffer);
     return 0;
 }
@@ -1072,7 +1072,7 @@
 int asedebug(const char *debugmsg)
 {
 	char buffer[1024];
-	sprintf(buffer, "%i:%s\n", aselineno, debugmsg);
+	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, debugmsg);
 	dialogMessage("Lexer", buffer);
     return 0;
 }
Only in scorched/src/3dsparse: aseFile.tab.cpp~
diff -ur scorched.orig/src/GLEXT/GLConsole.cpp scorched/src/GLEXT/GLConsole.cpp
--- scorched.orig/src/GLEXT/GLConsole.cpp	2005-04-05 00:35:23.000000000 +0200
+++ scorched/src/GLEXT/GLConsole.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -265,7 +265,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, TEXT_SIZE, fmt, ap);
 	va_end(ap);
 
 	DIALOG_ASSERT(strlen(text)getNumberParam(name_.c_str()));
+		snprintf(buffer, sizeof(buffer), "%.2f", user_->getNumberParam(name_.c_str()));
 		value = buffer;
 		break;
 	case GLConsoleRuleTypeString:
diff -ur scorched.orig/src/GLEXT/GLFont2d.cpp scorched/src/GLEXT/GLFont2d.cpp
--- scorched.orig/src/GLEXT/GLFont2d.cpp	2005-07-11 22:40:36.000000000 +0200
+++ scorched/src/GLEXT/GLFont2d.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -56,7 +56,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	float width = 0.0f;
@@ -75,7 +75,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	drawString((GLsizei) strlen(text), color, 1.0f, size, x, y, z, text, false);
@@ -89,7 +89,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	drawString((GLsizei) strlen(text), color, alpha, size, x, y, z, text, false);
@@ -103,7 +103,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	drawString((GLsizei) strlen(text), color, 1.0f, size, x, y, z, text, false, size2);
@@ -118,7 +118,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	int s = start;
@@ -143,7 +143,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	int l = 0;
@@ -165,7 +165,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	drawString((GLsizei) strlen(text), color, 1.0f, size, x, y, z, text, true);
diff -ur scorched.orig/src/GLW/GLWListView.cpp scorched/src/GLW/GLWListView.cpp
--- scorched.orig/src/GLW/GLWListView.cpp	2005-06-20 02:35:07.000000000 +0200
+++ scorched/src/GLW/GLWListView.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -107,7 +107,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	lines_.push_back(text);
diff -ur scorched.orig/src/GLW/GLWScorchedInfo.cpp scorched/src/GLW/GLWScorchedInfo.cpp
--- scorched.orig/src/GLW/GLWScorchedInfo.cpp	2005-02-13 01:05:13.000000000 +0100
+++ scorched/src/GLW/GLWScorchedInfo.cpp	2006-02-11 15:11:46.000000000 +0100
@@ -86,7 +86,7 @@
 			}
 			else
 			{
-				sprintf(buffer, "Force %.0f", 
+				snprintf(buffer, sizeof(buffer), "Force %.0f", 
 					ScorchedClient::instance()->
 					getOptionsTransient().getWindSpeed());
 			}
@@ -237,7 +237,7 @@
 			setToolTip(&model->getTips()->weaponTip);
 
 			static char buffer[256];
-			sprintf(buffer, "%s", 
+			snprintf(buffer, sizeof(buffer), "%s",
 				current->getAccessories().getWeapons().getCurrent()->getName());
 			float weaponWidth = (float) GLWFont::instance()->getSmallPtFont()->
 				getWidth(fontSize_, buffer);
Only in scorched/src/GLW: GLWScorchedInfo.cpp~
Only in scorched/src/GLW: GLWSelectorPart.cpp.orig
diff -ur scorched.orig/src/GLW/GLWToolTip.cpp scorched/src/GLW/GLWToolTip.cpp
--- scorched.orig/src/GLW/GLWToolTip.cpp	2005-08-12 16:20:11.000000000 +0200
+++ scorched/src/GLW/GLWToolTip.cpp	2006-02-11 15:07:49.000000000 +0100
@@ -58,7 +58,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, TEXT_SIZE, fmt, ap);
 	va_end(ap);
 
 	texts_.clear();
Only in scorched/src/GLW: GLWToolTip.cpp~
diff -ur scorched.orig/src/XML/XMLParser.cpp scorched/src/XML/XMLParser.cpp
--- scorched.orig/src/XML/XMLParser.cpp	2005-07-03 01:50:03.000000000 +0200
+++ scorched/src/XML/XMLParser.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -91,7 +91,7 @@
 	name_(name), parent_(0), type_(type)
 {
 	char buffer[20];
-	sprintf(buffer, "%.2f", content);
+	snprintf(buffer, sizeof(buffer), "%.2f", content);
 	content_ = buffer;
 }
 
@@ -460,7 +460,8 @@
 	XML_Error errorCode = XML_GetErrorCode(p_);
 
 	static char message[1024];
-	sprintf(message, "Parse Error, File %s: Line:%i Col:%i Error:%s",
+	snprintf(message, sizeof(message),
+		"Parse Error, File %s: Line:%i Col:%i Error:%s",
 		source_.c_str(),
 		XML_GetCurrentLineNumber(p_),
 		XML_GetCurrentColumnNumber(p_),
diff -ur scorched.orig/src/client/ServerBrowserServerList.cpp scorched/src/client/ServerBrowserServerList.cpp
--- scorched.orig/src/client/ServerBrowserServerList.cpp	2005-06-08 19:29:38.000000000 +0200
+++ scorched/src/client/ServerBrowserServerList.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -54,7 +54,7 @@
 {
 	// Create the message that will be sent to the master server
 	static char buffer[1024];
-	sprintf(buffer, 
+	snprintf(buffer, sizeof(buffer),
 		"GET %s/servers.php HTTP/1.0\r\n"
 		"User-Agent: Scorched3D\r\n"
 		"Host: %s\r\n"
diff -ur scorched.orig/src/client/SpeedChange.cpp scorched/src/client/SpeedChange.cpp
--- scorched.orig/src/client/SpeedChange.cpp	2004-11-22 00:19:51.000000000 +0100
+++ scorched/src/client/SpeedChange.cpp	2006-02-11 15:12:44.000000000 +0100
@@ -58,7 +58,7 @@
 	{
 		GLState state(GLState::BLEND_ON | GLState::TEXTURE_OFF); 
 		static char buffer[10];
-		sprintf(buffer, "%.1fX", speed);
+		snprintf(buffer, sizeof(buffer), "%.1fX", speed);
 
 		static Vector fontColor(0.7f, 0.7f, 0.2f);
 		GLWFont::instance()->getLargePtFont()->draw(fontColor, 20, 10.0f, 10.0f, 0.0f, buffer);
Only in scorched/src/client: SpeedChange.cpp~
diff -ur scorched.orig/src/common/ARGParser.cpp scorched/src/common/ARGParser.cpp
--- scorched.orig/src/common/ARGParser.cpp	2005-07-24 21:34:00.000000000 +0200
+++ scorched/src/common/ARGParser.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -102,7 +102,7 @@
 		else
 		{
 			char buffer[255];
-			sprintf(buffer, "ERROR: Unknown parameter : \"%s\"\n\n", firstCommand.c_str());
+			snprintf(buffer, sizeof(buffer), "ERROR: Unknown parameter : \"%s\"\n\n", firstCommand.c_str());
 			showArgs(buffer);
 			return false;
 		}
@@ -249,7 +249,7 @@
 		else if (itor->second.destI || itor->second.destInt) type = "";
 
 		char buffer2[255];
-		sprintf(buffer2, "\t%s %s", itor->first.c_str(), type);
+		snprintf(buffer2, sizeof(buffer2), "\t%s %s", itor->first.c_str(), type);
 		if (itor->second.help.size())
 		{
 			strcat(buffer2, std::string(abs(30 - int(strlen(buffer2))), ' ').c_str());
diff -ur scorched.orig/src/common/Defines.cpp scorched/src/common/Defines.cpp
--- scorched.orig/src/common/Defines.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/common/Defines.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -72,7 +72,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 #ifdef _WIN32
@@ -93,21 +93,14 @@
 
 void dialogAssert(const char *lineText, const int line, const char *file)
 {
-	// Dont use formatString here as this method is called by formatString.
-	char buffer[20048];
-	sprintf(buffer, "%s\n%i:%s", lineText, line, file);
-	dialogMessage("Program Assert", buffer);
+	dialogMessage("Program Assert", "%s\n%i:%s", lineText, line, file);
 	exit(64);
 }
 
 const char *formatStringList(const char *format, va_list ap)
 {
 	static char buffer[20048];
-	buffer[sizeof(buffer) - 1] = '\0';
-	vsprintf(buffer, format, ap);
-	if (buffer[sizeof(buffer) - 1] != 0) 
-		dialogAssert("buffer[sizeof(buffer) - 1] == 0", __LINE__, __FILE__);
-
+	vsnprintf(buffer, sizeof(buffer), format, ap);
 	return buffer;
 }
 
@@ -160,18 +153,20 @@
 	static char buffer[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
-	sprintf(buffer, getModFile("%s/%s", DefinesUtil::getDataFileMod(), filename));
+	snprintf(buffer, sizeof(buffer), "%s",
+		getModFile("%s/%s", DefinesUtil::getDataFileMod(), filename));
 	DefinesUtil::fileDos2Unix(buffer);
 	if (DefinesUtil::fileExists(buffer)) return buffer;
 
-	sprintf(buffer, getGlobalModFile("%s/%s", DefinesUtil::getDataFileMod(), filename));
+	snprintf(buffer, sizeof(buffer), "%s",
+		 getGlobalModFile("%s/%s", DefinesUtil::getDataFileMod(), filename));
 	DefinesUtil::fileDos2Unix(buffer);
 	if (DefinesUtil::fileExists(buffer)) return buffer;
 
-	sprintf(buffer, S3D_DATADIR "/%s", filename);
+	snprintf(buffer, sizeof(buffer), S3D_DATADIR "/%s", filename);
 	DefinesUtil::fileDos2Unix(buffer);
 
 	return buffer;
@@ -182,7 +177,7 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	const char *dataFileName = getDataFile(filename);
@@ -205,9 +200,9 @@
 	static char buffer[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
-	sprintf(buffer, S3D_DOCDIR "/%s", filename);
+	snprintf(buffer, sizeof(buffer), S3D_DOCDIR "/%s", filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -217,7 +212,7 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static std::string homeDir;
@@ -231,7 +226,7 @@
 	}
 
 	static char buffer[1024];
-	sprintf(buffer, "%s/%s", homeDir.c_str(), filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", homeDir.c_str(), filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -242,7 +237,7 @@
 	
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static std::string homeDir;
@@ -261,7 +256,7 @@
 	}
 
 	static char buffer[1024];
-	sprintf(buffer, "%s/%s", homeDir.c_str(), filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", homeDir.c_str(), filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -272,7 +267,7 @@
 	static char buffer[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	const char *homeDirStr = getSettingsFile("");
@@ -280,7 +275,7 @@
 	if (DefinesUtil::dirExists(newDir.c_str())) homeDirStr = newDir.c_str();
 	else if (DefinesUtil::dirMake(newDir.c_str())) homeDirStr = newDir.c_str();
 
-	sprintf(buffer, "%s/%s", homeDirStr, filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", homeDirStr, filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -290,7 +285,7 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static char buffer[1024];
@@ -299,7 +294,7 @@
 	if (DefinesUtil::dirExists(newDir.c_str())) homeDirStr = newDir.c_str();
 	else if (DefinesUtil::dirMake(newDir.c_str())) homeDirStr = newDir.c_str();
 
-	sprintf(buffer, "%s/%s", homeDirStr, filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", homeDirStr, filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -309,7 +304,7 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static std::string modDir;
@@ -324,7 +319,7 @@
 	}
 	         
 	static char buffer[1024];
-	sprintf(buffer, "%s/%s", modDir.c_str(), filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", modDir.c_str(), filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -334,11 +329,11 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static char buffer[1024];
-	sprintf(buffer, S3D_DATADIR "/data/globalmods/%s", filename);
+	snprintf(buffer, sizeof(buffer), S3D_DATADIR "/data/globalmods/%s", filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
diff -ur scorched.orig/src/common/FileLines.cpp scorched/src/common/FileLines.cpp
--- scorched.orig/src/common/FileLines.cpp	2004-11-09 00:43:23.000000000 +0100
+++ scorched/src/common/FileLines.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -96,7 +96,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 	fileLines_.push_back(text);
diff -ur scorched.orig/src/common/Logger.cpp scorched/src/common/Logger.cpp
--- scorched.orig/src/common/Logger.cpp	2005-06-20 02:35:08.000000000 +0200
+++ scorched/src/common/Logger.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -87,7 +87,7 @@
 	static char text[2048];
 	va_list ap;
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 	LoggerInfo info;
diff -ur scorched.orig/src/common/StatsLoggerFile.cpp scorched/src/common/StatsLoggerFile.cpp
--- scorched.orig/src/common/StatsLoggerFile.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/common/StatsLoggerFile.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -124,7 +124,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "fired \"%s\" [%s] \"%s\"", 
+	snprintf(message, sizeof(message), "fired \"%s\" [%s] \"%s\"", 
 		firedTank->getName(), firedTank->getUniqueId(),
 		weapon->getParent()->getName());
 
@@ -143,7 +143,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "resigined \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "resigined \"%s\" [%s]", 
 		resignedTank->getName(), resignedTank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -160,7 +160,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "joined \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "joined \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -177,7 +177,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "connected \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "connected \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -194,7 +194,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "disconnected \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "disconnected \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -211,7 +211,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "killed \"%s\" [%s] \"%s\" [%s] \"%s\"", 
+	snprintf(message, sizeof(message), "killed \"%s\" [%s] \"%s\" [%s] \"%s\"", 
 		firedTank->getName(), firedTank->getUniqueId(),
 		deadTank->getName(), deadTank->getUniqueId(),
 		weapon->getParent()->getName());
@@ -230,7 +230,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "teamkilled \"%s\" [%s] \"%s\" [%s] \"%s\"", 
+	snprintf(message, sizeof(message), "teamkilled \"%s\" [%s] \"%s\" [%s] \"%s\"", 
 		firedTank->getName(), firedTank->getUniqueId(),
 		deadTank->getName(), deadTank->getUniqueId(),
 		weapon->getParent()->getName());
@@ -249,7 +249,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "selfkilled \"%s\" [%s] \"%s\"", 
+	snprintf(message, sizeof(message), "selfkilled \"%s\" [%s] \"%s\"", 
 		firedTank->getName(), firedTank->getUniqueId(),
 		weapon->getParent()->getName());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
@@ -267,7 +267,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "won \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "won \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -284,7 +284,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "overallwinner \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "overallwinner \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -301,7 +301,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "weaponfired \"%s\"", weapon->getParent()->getName());
+	snprintf(message, sizeof(message), "weaponfired \"%s\"", weapon->getParent()->getName());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
 }
@@ -317,7 +317,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "weaponkilled \"%s\"", weapon->getParent()->getName());
+	snprintf(message, sizeof(message), "weaponkilled \"%s\"", weapon->getParent()->getName());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
 }
diff -ur scorched.orig/src/common/StatsLoggerMySQL.cpp scorched/src/common/StatsLoggerMySQL.cpp
--- scorched.orig/src/common/StatsLoggerMySQL.cpp	2005-08-08 11:37:24.000000000 +0200
+++ scorched/src/common/StatsLoggerMySQL.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -63,7 +63,7 @@
 	static char text[50000];
 	va_list ap;
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 	return (mysql_real_query(mysql_, text, strlen(text)) == 0);
diff -ur scorched.orig/src/coms/ComsConnectMessage.h scorched/src/coms/ComsConnectMessage.h
--- scorched.orig/src/coms/ComsConnectMessage.h	2005-07-21 22:34:24.000000000 +0200
+++ scorched/src/coms/ComsConnectMessage.h	2006-02-11 15:02:03.000000000 +0100
@@ -47,7 +47,7 @@
 	void setUniqueId(const char *uid) { setValue("uid", uid); }
 	void setHostDesc(const char *host) { setValue("host", host); }
 	void setNoPlayers(unsigned int players) { 
-		char buf[10]; sprintf(buf, "%i", players); setValue("numplayers", buf); }
+		char buf[11]; sprintf(buf, "%u", players); setValue("numplayers", buf); }
 
 	const char *getVersion() { return getValue("version"); }
 	const char *getProtocolVersion() { return getValue("pversion"); }
diff -ur scorched.orig/src/coms/ComsMessageHandler.cpp scorched/src/coms/ComsMessageHandler.cpp
--- scorched.orig/src/coms/ComsMessageHandler.cpp	2005-04-05 00:35:25.000000000 +0200
+++ scorched/src/coms/ComsMessageHandler.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -114,7 +114,8 @@
 	if (itor == handlerMap_.end())
 	{
 		char buffer[1024];
-		sprintf(buffer, "Failed to find message type handler \"%s\"",
+		snprintf(buffer, sizeof(buffer),
+			"Failed to find message type handler \"%s\"",
 			messageType.c_str());
 
 		if (connectionHandler_)
@@ -129,7 +130,8 @@
 		messageTypeStr, reader))
 	{
 		char buffer[1024];
-		sprintf(buffer, "Failed to handle message type \"%s\"",
+		snprintf(buffer, sizeof(buffer),
+			"Failed to handle message type \"%s\"",
 			messageType.c_str());
 
 		if (connectionHandler_)
diff -ur scorched.orig/src/dialogs/AutoDefenseDialog.cpp scorched/src/dialogs/AutoDefenseDialog.cpp
--- scorched.orig/src/dialogs/AutoDefenseDialog.cpp	2005-07-19 23:45:36.000000000 +0200
+++ scorched/src/dialogs/AutoDefenseDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -173,13 +173,13 @@
 		char buffer[256];
 		if (shieldcount > 0)
 		{
-			sprintf(buffer, "%s (%i)",
+			snprintf(buffer, sizeof(buffer), "%s (%i)",
 				shield->getName(),
 				shieldcount);
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)",
+			snprintf(buffer, sizeof(buffer), "%s (In)",
 				shield->getName());
 		}
 		ddshields_->addText(GLWSelectorEntry(buffer,
@@ -215,13 +215,13 @@
 		char buffer[256];
 		if (tank->getAccessories().getShields().getShieldCount(currentShield) > 0)
 		{
-			sprintf(buffer, "%s (%i)",
+			snprintf(buffer, sizeof(buffer), "%s (%i)",
 				currentShield->getName(),
 				tank->getAccessories().getShields().getShieldCount(currentShield));
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)",
+			snprintf(buffer, sizeof(buffer), "%s (In)",
 				currentShield->getName());
 		}
 		ddshields_->setText(buffer);
diff -ur scorched.orig/src/ode/error.cpp scorched/src/ode/error.cpp
--- scorched.orig/src/ode/error.cpp	2004-09-15 00:10:04.000000000 +0200
+++ scorched/src/ode/error.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -129,7 +129,7 @@
   else {
     char s[1000],title[100];
     sprintf (title,"ODE Error %d",num);
-    vsprintf (s,msg,ap);
+    vsnprintf (s,sizeof(s),msg,ap);
     s[sizeof(s)-1] = 0;
     MessageBox(0,s,title,MB_OK | MB_ICONWARNING);
   }
@@ -145,7 +145,7 @@
   else {
     char s[1000],title[100];
     sprintf (title,"ODE INTERNAL ERROR %d",num);
-    vsprintf (s,msg,ap);
+    vsnprintf (s,sizeof(s),msg,ap);
     s[sizeof(s)-1] = 0;
     MessageBox(0,s,title,MB_OK | MB_ICONSTOP);
   }
diff -ur scorched.orig/src/ode/testing.cpp scorched/src/ode/testing.cpp
--- scorched.orig/src/ode/testing.cpp	2003-07-10 18:30:19.000000000 +0200
+++ scorched/src/ode/testing.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -72,7 +72,7 @@
 
     va_list ap;
     va_start (ap,name);
-    vsprintf (mi->name,name,ap);
+    vsnprintf (mi->name, sizeof(mi->name), name, ap);
     if (strlen(mi->name) >= sizeof (mi->name)) dDebug (0,"name too long");
 
     mat.push (mi);
@@ -88,7 +88,7 @@
     dMatInfo mi;
     va_list ap;
     va_start (ap,name);
-    vsprintf (mi.name,name,ap);
+    vsnprintf (mi.name, sizeof(mi.name), name, ap);
     if (strlen(mi.name) >= sizeof (mi.name)) dDebug (0,"name too long");
 
     if (strcmp(mp->name,mi.name) != 0)
diff -ur scorched.orig/src/scorched/DisplayDialog.cpp scorched/src/scorched/DisplayDialog.cpp
--- scorched.orig/src/scorched/DisplayDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/DisplayDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -265,8 +265,8 @@
 			const char *stateName = "";
 			KeyboardKey::translateKeyNameValue(key->getKeys()[position].key, keyName);
 			KeyboardKey::translateKeyStateValue(key->getKeys()[position].state, stateName);
-			if (strcmp(stateName, "NONE") == 0) sprintf(buffer, "%s", keyName);
-			else sprintf(buffer, "<%s> %s", stateName, keyName);
+			if (strcmp(stateName, "NONE") == 0) snprintf(buffer, sizeof(buffer), "%s", keyName);
+			else snprintf(buffer, sizeof(buffer), "<%s> %s", stateName, keyName);
 		}
 		button->SetLabel(wxString(buffer, wxConvUTF8));
 	}
diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
--- scorched.orig/src/scorched/MainDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -143,11 +143,11 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 	char path[1024];
-	sprintf(path, "%s %s", exeName, text);
+	snprintf(path, sizeof(path), "%s %s", exeName, text);
 
 	ScorchedProcess *process = new ScorchedProcess();
 	long result = ::wxExecute(wxString(path, wxConvUTF8), wxEXEC_ASYNC, process);
diff -ur scorched.orig/src/scorched/NetDialog.cpp scorched/src/scorched/NetDialog.cpp
--- scorched.orig/src/scorched/NetDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/NetDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -127,7 +127,7 @@
 				ServerBrowser::instance()->getServerList().
 					getEntryValue(item, "maxplayers");
 			char text[256];
-			sprintf(text, "%s/%s", clients.c_str(), maxclients.c_str());
+			snprintf(text, sizeof(text), "%s/%s", clients.c_str(), maxclients.c_str());
 
 			return wxString(text, wxConvUTF8);
 		}
@@ -498,7 +498,7 @@
 		wxString username = IDC_EDIT_NAME_CTRL->GetValue();
 
 		char buffer[1024];
-		sprintf(buffer, "-connect \"%s\"", (const char *) value.mb_str(wxConvUTF8));
+		snprintf(buffer, sizeof(buffer), "-connect \"%s\"", (const char *) value.mb_str(wxConvUTF8));
 
 		if (!password.empty())
 		{
diff -ur scorched.orig/src/scorched/ServerDialog.cpp scorched/src/scorched/ServerDialog.cpp
--- scorched.orig/src/scorched/ServerDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/ServerDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -402,7 +402,7 @@
 	{
 		TankAI *ai = (*aiitor);
 		char buffer[256];
-		sprintf(buffer, "Add %s", ai->getName());
+		snprintf(buffer, sizeof(buffer), "Add %s", ai->getName());
 		menuAddPlayer->Append(IDC_MENU_PLAYERADD_1 + aicount, wxString(buffer, wxConvUTF8));
 	}
 
@@ -841,7 +841,8 @@
 void showServerDialog()
 {
 	char serverName[1024];
-	sprintf(serverName, "Scorched 3D Dedicated Server [ %s : %i ] [%s]",
+	snprintf(serverName, sizeof(serverName),
+			"Scorched 3D Dedicated Server [ %s : %i ] [%s]",
 			ScorchedServer::instance()->getOptionsGame().getServerName(), 
 			ScorchedServer::instance()->getOptionsGame().getPortNo(), 
 			(ScorchedServer::instance()->getOptionsGame().getPublishServer()?"Published":"Not Published"));
diff -ur scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
--- scorched.orig/src/scorched/SettingsDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/SettingsDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -417,7 +417,7 @@
 			(void *) (OptionsGame::WindRandom));
 		for (int i=0; i<=5; i++)
 		{
-			char buffer[25];
+			char buffer[30];
 			sprintf(buffer, "Force %i%s", i, ((i==0)?" (No Wind)":""));
 			SettingsEnv::IDC_COMBO_FORCE_CTRL->Append(
 				wxString(buffer, wxConvUTF8), (void *) (i+1));
@@ -471,7 +471,7 @@
 		for (int i=0; i<=20; i++)
 		{
 			char buffer[25];
-			sprintf(buffer, "%i", i, i);
+			sprintf(buffer, "%i", i);
 			if (i<=10)
 			{
 				SettingsEnv::IDC_COMBO_STARTARMSLEVEL_CTRL->Append(wxString(buffer, wxConvUTF8), (void *) i);
Only in scorched/src/scorched: SingleChoiceDialog.cpp.orig
diff -ur scorched.orig/src/scorched/main.cpp scorched/src/scorched/main.cpp
--- scorched.orig/src/scorched/main.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/main.cpp	2006-02-11 15:06:24.000000000 +0100
@@ -145,7 +145,8 @@
 int main(int argc, char *argv[])
 {
 	// Generate the version
-	sprintf(scorched3dAppName, "Scorched3D - Version %s (%s)", 
+	snprintf(scorched3dAppName, sizeof(scorched3dAppName),
+		"Scorched3D - Version %s (%s)", 
 		ScorchedVersion, ScorchedProtocolVersion);
 
 	srand((unsigned)time(0));
Only in scorched/src/scorched: main.cpp~
diff -ur scorched.orig/src/server/ServerBrowserInfo.cpp scorched/src/server/ServerBrowserInfo.cpp
--- scorched.orig/src/server/ServerBrowserInfo.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/server/ServerBrowserInfo.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -138,7 +138,7 @@
 {
 	char *serverName = (char *) ScorchedServer::instance()->getOptionsGame().getServerName();
 	char version[256];
-	sprintf(version, "%s (%s)", ScorchedVersion, ScorchedProtocolVersion);
+	snprintf(version, sizeof(version), "%s (%s)", ScorchedVersion, ScorchedProtocolVersion);
 	unsigned currentState = ScorchedServer::instance()->getGameState().getState();
 	bool started = !ServerTooFewPlayersStimulus::instance()->acceptStateChange(0, 0, 0.0f);
 	char players[25];
@@ -146,7 +146,7 @@
 	char maxplayers[25];
 	sprintf(maxplayers, "%i", ScorchedServer::instance()->getOptionsGame().getNoMaxPlayers());
 	char type[100];
-	sprintf(type, "%s (%s)", 
+	snprintf(type, sizeof(type), "%s (%s)", 
 		ScorchedServer::instance()->getOptionsTransient().getGameType(),
 		((ScorchedServer::instance()->getOptionsGame().getTeams() > 1)?"Teams":"No Teams"));
 	wxString osDesc = ::wxGetOsDescription();
diff -ur scorched.orig/src/server/ServerCommon.cpp scorched/src/server/ServerCommon.cpp
--- scorched.orig/src/server/ServerCommon.cpp	2005-08-14 21:11:42.000000000 +0200
+++ scorched/src/server/ServerCommon.cpp	2006-02-11 15:12:42.000000000 +0100
@@ -63,7 +63,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	ComsTextMessage message(text, 0, true);
@@ -83,7 +83,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	ComsTextMessage message(text);
@@ -104,7 +104,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	std::map &tanks = 
@@ -295,7 +295,7 @@
 		// Add the actual log message
 		va_list ap;
 		va_start(ap, fmt);
-		vsprintf(text, fmt, ap);
+		vsnprintf(text, sizeof(text), fmt, ap);
 		va_end(ap);
 
 		Logger::log(text);
Only in scorched/src/server: ServerCommon.cpp~
diff -ur scorched.orig/src/server/ServerRegistration.cpp scorched/src/server/ServerRegistration.cpp
--- scorched.orig/src/server/ServerRegistration.cpp	2005-06-08 19:29:38.000000000 +0200
+++ scorched/src/server/ServerRegistration.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -39,7 +39,7 @@
 	netServer_(new NetServerHTTPProtocolSend)
 {
 	static char buffer[1024];
-	sprintf(buffer, 
+	snprintf(buffer, sizeof(buffer),
 		"GET %s/servers.php?register=%s&port=%i HTTP/1.0\r\n"
 		"User-Agent: Scorched3D\r\n"
 		"Host: %s\r\n"
diff -ur scorched.orig/src/tank/TankPhysics.cpp scorched/src/tank/TankPhysics.cpp
--- scorched.orig/src/tank/TankPhysics.cpp	2005-06-11 18:53:41.000000000 +0200
+++ scorched/src/tank/TankPhysics.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -248,13 +248,13 @@
 
 	if (OptionsDisplay::instance()->getUseHexidecimal())
 	{
-		sprintf(messageBuffer, "0x%x (0x%x)", 
+		snprintf(messageBuffer, sizeof(messageBuffer), "0x%x (0x%x)", 
 				int(360.0f - getRotationGunXY()),
 				int(rotDiff));
 	}
 	else
 	{
-		sprintf(messageBuffer, "%.1f (%+.1f)", 
+		snprintf(messageBuffer, sizeof(messageBuffer), "%.1f (%+.1f)", 
 				360.0f - getRotationGunXY(),
 				rotDiff);
 	}
@@ -269,13 +269,13 @@
 
 	if (OptionsDisplay::instance()->getUseHexidecimal())
 	{
-		sprintf(messageBuffer, "0x%x (0X%x)", 
+		snprintf(messageBuffer, sizeof(messageBuffer), "0x%x (0X%x)", 
 				int(getRotationGunYZ()),
 				int(rotDiff));
 	}
 	else
 	{
-		sprintf(messageBuffer, "%.1f (%+.1f)", 
+		snprintf(messageBuffer, sizeof(messageBuffer), "%.1f (%+.1f)", 
 				getRotationGunYZ(),
 				rotDiff);
 	}
@@ -289,13 +289,13 @@
 
 	if (OptionsDisplay::instance()->getUseHexidecimal())
 	{
-		sprintf(messageBuffer, "0X%x (0X%x)", 		
+		snprintf(messageBuffer, sizeof(messageBuffer), "0X%x (0X%x)", 		
 				int(getPower()),
 				int(powDiff));
 	}
 	else
 	{
-		sprintf(messageBuffer, "%.1f (%+.1f)", 		
+		snprintf(messageBuffer, sizeof(messageBuffer), "%.1f (%+.1f)", 		
 				getPower(),
 				powDiff);
 	}
diff -ur scorched.orig/src/tank/TankState.cpp scorched/src/tank/TankState.cpp
--- scorched.orig/src/tank/TankState.cpp	2005-07-17 13:32:05.000000000 +0200
+++ scorched/src/tank/TankState.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -88,7 +88,7 @@
 const char *TankState::getStateString()
 {
 	static char string[1024];
-	sprintf(string, "%s - %s %s(%i hp)",
+	snprintf(string, sizeof(string), "%s - %s %s(%i hp)",
 		((readyState_==sReady)?"Rdy":"Wait"),
 		getSmallStateString(),
 		(muted_?"muted ":""),
diff -ur scorched.orig/src/tank/TankWeapon.cpp scorched/src/tank/TankWeapon.cpp
--- scorched.orig/src/tank/TankWeapon.cpp	2005-07-27 01:51:21.000000000 +0200
+++ scorched/src/tank/TankWeapon.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -206,7 +206,7 @@
 {
 	static char buffer[256];
 	int count = getWeaponCount(getCurrent());
-	sprintf(buffer, ((count>0)?"%s (%i)":"%s (In)"),
+	snprintf(buffer, sizeof(buffer), ((count>0)?"%s (%i)":"%s (In)"),
 		getCurrent()->getName(), count);
 	return buffer;
 }
diff -ur scorched.orig/src/tankai/TankAIAdder.cpp scorched/src/tankai/TankAIAdder.cpp
--- scorched.orig/src/tankai/TankAIAdder.cpp	2005-04-05 00:35:25.000000000 +0200
+++ scorched/src/tankai/TankAIAdder.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -72,7 +72,7 @@
 		char uniqueId[256];
 		{
 			std::set usedIds;
-			sprintf(uniqueId, "%s - computer - %%i", aiName);
+			snprintf(uniqueId, sizeof(uniqueId), "%s - computer - %%i", aiName);
 			std::map &playingTanks = 
 				context.getTankContainer().getPlayingTanks();
 			std::map::iterator playingItor;
@@ -94,7 +94,7 @@
 			int uniqueIdCount = 1;
 			while (usedIds.find(uniqueIdCount) != usedIds.end()) uniqueIdCount++;
 
-			sprintf(uniqueId, "%s - computer - %i", aiName, uniqueIdCount);
+			snprintf(uniqueId, sizeof(uniqueId), "%s - computer - %i", aiName, uniqueIdCount);
 		}
 
 		std::string newname = name;
diff -ur scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
--- scorched.orig/src/tankgraph/GLWTankTip.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/tankgraph/GLWTankTip.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -50,7 +50,7 @@
 	for (int i=0; i<(int) oldShots.size(); i++)
 	{
 		char buffer[128];
-		sprintf(buffer, "%s%i: Pwr:%.1f Ele:%.1f Rot:%.1f",
+		snprintf(buffer, sizeof(buffer), "%s%i: Pwr:%.1f Ele:%.1f Rot:%.1f",
 			(oldShots[i].current?"* ":"  "),
 			i, oldShots[i].power, oldShots[i].ele,
 			(360.0f - oldShots[i].rot));
@@ -211,13 +211,13 @@
 		char buffer[128];
 		if (count >= 0)
 		{
-			sprintf(buffer, "%s (%i)", 
+			snprintf(buffer, sizeof(buffer), "%s (%i)", 
 				current->getName(),
 				count);
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)",
+			snprintf(buffer, sizeof(buffer), "%s (In)",
 				current->getName());
 		}
 		entries.push_back(GLWSelectorEntry(buffer, ¤t->getToolTip(), 
@@ -432,13 +432,13 @@
 		char buffer[128];
 		if (count > 0)
 		{
-			sprintf(buffer, "%s (%i)", 
+			snprintf(buffer, sizeof(buffer), "%s (%i)", 
 				weapon->getName(),
 				count);
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)", 
+			snprintf(buffer, sizeof(buffer), "%s (In)", 
 				weapon->getName());
 		}
 		entries.push_back(GLWSelectorEntry(buffer, &weapon->getToolTip(), 
diff -ur scorched.orig/src/tankgraph/TankMenus.cpp scorched/src/tankgraph/TankMenus.cpp
--- scorched.orig/src/tankgraph/TankMenus.cpp	2005-07-19 23:45:37.000000000 +0200
+++ scorched/src/tankgraph/TankMenus.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -193,7 +193,7 @@
 		}
 
 		char buffer[1024];
-		sprintf(buffer, "%c %8s - \"%10s\" (%s)", 
+		snprintf(buffer, 1024, "%c %8s - \"%10s\" (%s)", 
 			currentTank == tank?'>':' ',
 			description,
 			tank->getName(), modelId.getModelName());
@@ -394,12 +394,12 @@
 		static char buffer[1024];
 		if (accessoryCount > 0)
 		{
-			sprintf(buffer, "%s (%i)", 
+			snprintf(buffer, sizeof(buffer), "%s (%i)", 
 				accessory->getName(), accessoryCount);
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)", 
+			snprintf(buffer, sizeof(buffer), "%s (In)", 
 				accessory->getName());
 		}
 		menuItems_.push_back(accessory);

scorched3d-strxxx.patch:

--- NEW FILE scorched3d-strxxx.patch ---
Only in scorched: aap
diff -ur scorched.orig/src/3dsparse/MSModelFactory.cpp scorched/src/3dsparse/MSModelFactory.cpp
--- scorched.orig/src/3dsparse/MSModelFactory.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/3dsparse/MSModelFactory.cpp	2006-02-11 16:10:25.000000000 +0100
@@ -80,7 +80,7 @@
 void MSModelFactory::loadFile(FILE *in, const char *fileName, Model *model)
 {
 	char filePath[256];
-	strcpy(filePath, fileName);
+	snprintf(filePath, sizeof(filePath), "%s", fileName);
 
 	char *sep;
 	while (sep=strchr(filePath, '\\')) *sep = '/';
diff -ur scorched.orig/src/3dsparse/aseFile.lex.cpp scorched/src/3dsparse/aseFile.lex.cpp
--- scorched.orig/src/3dsparse/aseFile.lex.cpp	2004-03-01 18:48:17.000000000 +0100
+++ scorched/src/3dsparse/aseFile.lex.cpp	2006-02-11 16:13:01.000000000 +0100
@@ -873,7 +873,7 @@
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-{ strcpy(aseString, asetext ); return MAX_STRING; }
+{ snprintf(aseString, sizeof(aseString), "%s", asetext ); return MAX_STRING; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
Only in scorched/src/3dsparse: aseFile.lex.cpp~
diff -ur scorched.orig/src/GLEXT/GLConsoleRules.cpp scorched/src/GLEXT/GLConsoleRules.cpp
--- scorched.orig/src/GLEXT/GLConsoleRules.cpp	2003-08-01 00:37:11.000000000 +0200
+++ scorched/src/GLEXT/GLConsoleRules.cpp	2006-02-11 16:22:14.000000000 +0100
@@ -73,7 +73,7 @@
 	if (matches.size() == 1) return matches.front()->getName();
 
 	static char buffer[1024];
-	strcpy(buffer, line);
+	snprintf(buffer, sizeof(buffer), "%s", line);
 
 	int pos = (int) strlen(line);
 	while (true)
Only in scorched/src/GLEXT: GLConsoleRules.cpp~
diff -ur scorched.orig/src/GLEXT/GLState.cpp scorched/src/GLEXT/GLState.cpp
--- scorched.orig/src/GLEXT/GLState.cpp	2004-09-07 14:29:13.000000000 +0200
+++ scorched/src/GLEXT/GLState.cpp	2006-02-11 16:29:28.000000000 +0100
@@ -105,15 +105,16 @@
 {
 	static char buffer[1024];
 	buffer[0] = '\0';
-
-	if (currentState_ & TEXTURE_ON) strcat(buffer, "TEXTURE_ON\n");
-	if (currentState_ & TEXTURE_OFF) strcat(buffer, "TEXTURE_ON\n");
-	if (currentState_ & DEPTH_ON) strcat(buffer, "DEPTH_ON\n");
-	if (currentState_ & DEPTH_OFF) strcat(buffer, "DEPTH_OFF\n");
-	if (currentState_ & BLEND_ON) strcat(buffer, "BLEND_ON\n");
-	if (currentState_ & BLEND_OFF) strcat(buffer, "BLEND_OFF\n");
-	if (currentState_ & CUBEMAP_ON) strcat(buffer, "CUBEMAP_ON\n");
-	if (currentState_ & CUBEMAP_OFF) strcat(buffer, "CUBEMAP_OFF\n");
+	
+	snprintf(buffer, sizeof(buffer), "%s%s%s%s%s%s%s%s",
+		(currentState_ & TEXTURE_ON)? "TEXTURE_ON\n":"",
+		(currentState_ & TEXTURE_OFF)? "TEXTURE_ON\n":"",
+		(currentState_ & DEPTH_ON)? "DEPTH_ON\n":"",
+		(currentState_ & DEPTH_OFF)? "DEPTH_OFF\n":"",
+		(currentState_ & BLEND_ON)? "BLEND_ON\n":"",
+		(currentState_ & BLEND_OFF)? "BLEND_OFF\n":"",
+		(currentState_ & CUBEMAP_ON)? "CUBEMAP_ON\n":"",
+		(currentState_ & CUBEMAP_OFF)? "CUBEMAP_OFF\n":"");
 
 	return buffer;
 }
Only in scorched/src/GLEXT: GLState.cpp~
diff -ur scorched.orig/src/client/ServerBrowserRefresh.cpp scorched/src/client/ServerBrowserRefresh.cpp
--- scorched.orig/src/client/ServerBrowserRefresh.cpp	2003-10-17 12:38:00.000000000 +0200
+++ scorched/src/client/ServerBrowserRefresh.cpp	2006-02-11 16:15:52.000000000 +0100
@@ -72,7 +72,7 @@
 	if (!name[0]) return;
 
 	static char buffer[256];
-	strcpy(buffer, name);
+	snprintf(buffer, sizeof(buffer), "%s", name);
 	char *port = strchr(buffer, ':');
 	if (!port) return;
 	*port = '\0';
Only in scorched/src/client: ServerBrowserRefresh.cpp~
diff -ur scorched.orig/src/client/ServerBrowserServerList.cpp scorched/src/client/ServerBrowserServerList.cpp
--- scorched.orig/src/client/ServerBrowserServerList.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/client/ServerBrowserServerList.cpp	2006-02-11 16:13:53.000000000 +0100
@@ -239,7 +239,7 @@
 	SDL_LockMutex(vectorMutex_);
 	ServerBrowserEntry &entry = getEntry(pos);
 	static char buffer[256];
-	strcpy(buffer, entry.getAttribute(name));
+	snprintf(buffer, sizeof(buffer), "%s", entry.getAttribute(name));
 	SDL_UnlockMutex(vectorMutex_);
 
 	return buffer;
diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
--- scorched.orig/src/scorched/MainDialog.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-11 16:17:37.000000000 +0100
@@ -77,11 +77,8 @@
 
 void setExeName(const char *name, bool allowExceptions)
 {
-	strcpy(exeName, name);
-	if (allowExceptions)
-	{
-		strcat(exeName, " -allowexceptions");
-	}
+	snprintf(exeName, sizeof(exeName), "%s%s", name,
+		allowExceptions? " -allowexceptions":"");
 }
 
 static SDL_mutex *messageMutex_ = 0;
diff -ur scorched.orig/src/scorched/main.cpp scorched/src/scorched/main.cpp
--- scorched.orig/src/scorched/main.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/scorched/main.cpp	2006-02-11 16:18:13.000000000 +0100
@@ -159,7 +159,7 @@
 	{
 		// Perhaps we can get the directory from the executables path name
 		char path[1024];
-		strcpy(path, argv[0]);
+		snprintf(path, sizeof(path), "%s", argv[0]);
 		char *sep = strrchr(path, '/');
 		if (sep)
 		{
diff -ur scorched.orig/src/server/ServerBrowserInfo.cpp scorched/src/server/ServerBrowserInfo.cpp
--- scorched.orig/src/server/ServerBrowserInfo.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/server/ServerBrowserInfo.cpp	2006-02-11 16:21:52.000000000 +0100
@@ -232,7 +232,7 @@
 {
 	static char buffer[10000];
 	static char newvalue[10000];
-	strcpy(newvalue, value);
+	snprintf(newvalue, sizeof(newvalue), "%s", value);
 	for (char *a=newvalue; *a; a++)
 	{
 		if (*a == '\'') *a='\"';
@@ -240,7 +240,6 @@
 		else if (*a == '<') *a=' ';
 	}
 
-	strcpy(buffer, name); strcat(buffer, "='");
-	strcat(buffer, newvalue); strcat(buffer, "' ");
+	snprintf(buffer, sizeof(buffer), "%s='%s' ", name, newvalue);
 	return buffer;
 }
diff -ur scorched.orig/src/skincreator/main.cpp scorched/src/skincreator/main.cpp
--- scorched.orig/src/skincreator/main.cpp	2003-08-31 13:30:48.000000000 +0200
+++ scorched/src/skincreator/main.cpp	2006-02-11 16:22:37.000000000 +0100
@@ -62,7 +62,7 @@
 	GLBitmap bitmap;
 	bitmap.grabScreen();
 	char buffer[1024];
-	strcpy(buffer, argv[1]);
+	snprintf(buffer, sizeof(buffer), "%s", argv[1]);
 	char *pos = strrchr(buffer, '.');
 	if (pos)
 	{
--- scorched/src/dialogs/ScoreDialog.cpp~	2006-02-11 20:05:20.000000000 +0100
+++ scorched/src/dialogs/ScoreDialog.cpp	2006-02-11 20:05:20.000000000 +0100
@@ -347,7 +347,8 @@
 
 	// Form the name
 	static char name[256];
-	strcpy(name, current->getName());
+	// Max strcat usage 12
+	snprintf(name, sizeof(name) - 12, "%s", current->getName());
 	if (finished && ! OptionsParam::instance()->getConnectedToServer())
 	{
 		strcat(name, " (");


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scorched3d.spec	9 Feb 2006 21:57:31 -0000	1.10
+++ scorched3d.spec	11 Feb 2006 19:33:16 -0000	1.11
@@ -15,6 +15,12 @@
 Patch4:         %{name}-64bit.patch
 Patch5:         %{name}-openal.patch
 Patch6:         %{name}-help.patch
+Patch7:         %{name}-sprintf.patch
+Patch8:         %{name}-formatstring.patch
+Patch9:         %{name}-strxxx.patch
+Patch10:        %{name}-negint.patch
+Patch11:        %{name}-XML-injection.patch
+Patch12:        %{name}-HTML-injection.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
@@ -50,13 +56,19 @@
 find . -type d -name CVS | xargs rm -r
 rm -r autom4te.cache `find . -name Makefile`
 rm -r src/zlib `find src/XML ! -name "X*"`
-%patch0 -p1 -z .cvs
-%patch1 -p1 -z .syslibs
-%patch2 -p0 -z .aclocal18
-%patch3 -p1 -z .gcc41
-%patch4 -p1 -z .64bit
-%patch5 -p1 -z .openal
-%patch6 -p1 -z .help
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 . autogen.sh
 
 
@@ -98,7 +110,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO __docs/
+%doc AUTHORS COPYING TODO __docs/*
 %{_bindir}/scorched3d
 %{_datadir}/games/scorched3d/
 %{_datadir}/applications/*scorched3d.desktop
@@ -106,15 +118,19 @@
 
 
 %changelog
-* Thu Feb  9 2006  - 39.1-2
+* Sat Feb 11 2006  - 39.1-2
 - upgrade to CVS snapshot of 20050929, as Debian does, but not to
-  the newer apoc version as this causes problems playing online
-- fix gcc41 compilation
-- fix 64 bit compilation (bz 158646)
-- fix compile with openal-0.9
+  the newer apoc version as this causes problems playing online (patch 0)
+- fix gcc41 compilation (patch 3)
+- fix 64 bit compilation (bz 158646) (patch 4)
+- fix compile with openal-0.9 (patch 5)
 - use htmlview for helpfile viewing instead of hardcoded mozilla,
-  run this in background so the game doesn't freeze
-- this release also fixes bz 161694, 173187
+  run this in background so the game doesn't freeze (patch 6)
+- fix all the security issues reported on the fulldisclosure mailinglist:
+  http://seclists.org/lists/fulldisclosure/2005/Nov/0079.html
+  (bz 161694) (patch 7, 8, 9, 10)
+- fix 2 additonal security issues found while fixing the above (patch 11, 12)
+- this release also fixes bz 161694
 
 * Sat Oct  8 2005 Ville Skytt??  - 39.1-1
 - 39.1.


--- scorched3d-buf.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Feb 11 23:42:50 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Feb 2006 18:42:50 -0500
Subject: owners owners.list,1.631,1.632
Message-ID: <200602112343.k1BNhMBK010898@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
fish : there's a mismatch between who gets the bugzilla tickets and who maintains the package in CVS


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -r1.631 -r1.632
--- owners.list	11 Feb 2006 10:36:07 -0000	1.631
+++ owners.list	11 Feb 2006 23:42:49 -0000	1.632
@@ -224,7 +224,7 @@
 Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|fish|A friendly interactive shell|oliver at linux-kernel.at|extras-qa at fedoraproject.org|liljencrantz at gmail.com
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Feb 11 23:48:42 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 18:48:42 -0500
Subject: rpms/ecore/FC-4 ecore.spec,1.1,1.2
Message-ID: <200602112349.k1BNnE83010994@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	ecore.spec 
Log Message:
Enable curl


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-4/ecore.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ecore.spec	11 Feb 2006 10:27:21 -0000	1.1
+++ ecore.spec	11 Feb 2006 23:48:42 -0000	1.2
@@ -37,7 +37,7 @@
 rm examples/Makefile*
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-curl
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Sat Feb 11 23:50:10 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 11 Feb 2006 18:50:10 -0500
Subject: rpms/ecore/devel ecore.spec,1.1,1.2
Message-ID: <200602112350.k1BNogpn011066@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	ecore.spec 
Log Message:
Modular X, enable curl


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/ecore.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ecore.spec	11 Feb 2006 10:27:21 -0000	1.1
+++ ecore.spec	11 Feb 2006 23:50:10 -0000	1.2
@@ -13,7 +13,9 @@
 
 BuildRequires:  edb-devel eet-devel evas-devel directfb-devel
 BuildRequires:  curl-devel libjpeg-devel
-BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-proto-devel libX11-devel libXext-devel
+BuildRequires:  libXcursor-devel libXp-devel libXrandr-devel
+BuildRequires:  libXrender-devel libXinerama-devel
 
 %description
 Ecore is the core event abstraction layer and X abstraction layer that makes
@@ -37,7 +39,7 @@
 rm examples/Makefile*
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-curl
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Sun Feb 12 00:09:03 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 11 Feb 2006 19:09:03 -0500
Subject: rpms/gl-117/devel gl-117.spec,1.6,1.7
Message-ID: <200602120009.k1C09dk2013001@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/gl-117/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12983

Modified Files:
	gl-117.spec 
Log Message:
Drop BR: xorg-x11-devel, since it should be pulled in by SDL-devel
Don't hard-code path to X libs
Drop hard-coded LDFLAGS
Drop redundant "for Linux..." from description



Index: gl-117.spec
===================================================================
RCS file: /cvs/extras/rpms/gl-117/devel/gl-117.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gl-117.spec	26 Sep 2005 17:33:17 -0000	1.6
+++ gl-117.spec	12 Feb 2006 00:09:02 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gl-117
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Action flight simulator
 
@@ -13,21 +13,21 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_mixer-devel
-BuildRequires:  xorg-x11-devel, freeglut-devel
+BuildRequires:  freeglut-devel
 BuildRequires:  desktop-file-utils
 
 %description
-GL-117 is an action flight simulator for Linux/Unix and MSWindows. Enter the
-Eagle Squadron and succeed in several challanging missions leading though
-different landscapes. Five predefined levels of video quality and an amount of
-viewing ranges let you perfectly adjust the game to the performance of your
-system. Joystick, mouse, sound effects, music...
+GL-117 is an action flight simulator. Enter the Eagle Squadron and succeed
+in several challanging missions leading though different landscapes. Five
+predefined levels of video quality and an amount of viewing ranges let you
+perfectly adjust the game to the performance of your system. Joystick,
+mouse, sound effects, music...
 
 %prep
 %setup -q -n %{name}-%{version}-src
 
 %build
-%configure LDFLAGS="-L/usr/X11R6/%{_lib} -lX11 -lXi -lXmu"
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -55,6 +55,12 @@
 %{_mandir}/man6/*
 
 %changelog
+* Sat Dec 03 2005 Steven Pritchard  1.3.2-2
+- Drop BR: xorg-x11-devel, since it should be pulled in by SDL-devel
+- Don't hard-code path to X libs
+- Drop hard-coded LDFLAGS
+- Drop redundant "for Linux..." from description
+
 * Mon Sep 26 2005 Steven Pritchard  1.3.2-1
 - Update to 1.3.2 (#169275)
 - BR xorg-x11-devel instead of XFree86-devel



From fedora-extras-commits at redhat.com  Sun Feb 12 00:11:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 11 Feb 2006 19:11:56 -0500
Subject: rpms/gl-117/devel gl-117.spec,1.7,1.8
Message-ID: <200602120012.k1C0CSoP013036@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/gl-117/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13019

Modified Files:
	gl-117.spec 
Log Message:
Change date in %changelog to when I finished, not when I started.  :)


Index: gl-117.spec
===================================================================
RCS file: /cvs/extras/rpms/gl-117/devel/gl-117.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gl-117.spec	12 Feb 2006 00:09:02 -0000	1.7
+++ gl-117.spec	12 Feb 2006 00:11:55 -0000	1.8
@@ -55,7 +55,7 @@
 %{_mandir}/man6/*
 
 %changelog
-* Sat Dec 03 2005 Steven Pritchard  1.3.2-2
+* Sat Feb 11 2006 Steven Pritchard  1.3.2-2
 - Drop BR: xorg-x11-devel, since it should be pulled in by SDL-devel
 - Don't hard-code path to X libs
 - Drop hard-coded LDFLAGS



From fedora-extras-commits at redhat.com  Sun Feb 12 00:13:56 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 11 Feb 2006 19:13:56 -0500
Subject: rpms/scim-input-pad/devel scim-input-pad.spec,1.3,1.4
Message-ID: <200602120014.k1C0ESms013073@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	scim-input-pad.spec 
Log Message:
a little cleanup



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim-input-pad.spec	23 Dec 2005 10:19:52 -0000	1.3
+++ scim-input-pad.spec	12 Feb 2006 00:13:51 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -9,6 +9,8 @@
 Source0:        http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         scim-input-pad-rpath.patch
+
 BuildRequires:  scim-devel
 Requires:       scim
 
@@ -17,10 +19,11 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -28,8 +31,8 @@
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
-rm ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
 
 %find_lang %{name}
 
@@ -46,7 +49,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog
+%doc COPYING README ChangeLog
 %{_bindir}/scim-input-pad
 %{_libdir}/libscim-input-pad.so.*
 %{_libdir}/scim-1.0/Helper/input-pad.so
@@ -56,7 +59,10 @@
 
 
 %changelog
-* Fri Dec 23 2005 Ryo Dairiki 
+* Sun Feb 12 2006 Ryo Dairiki  - 0.1.1-2
+- a little cleanup
+
+* Fri Dec 23 2005 Ryo Dairiki  - 0.1.1-1
 - update to 0.1.1
 - get rid of the patch for irregal casting
 



From fedora-extras-commits at redhat.com  Sun Feb 12 00:17:31 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 11 Feb 2006 19:17:31 -0500
Subject: rpms/scim-input-pad/devel scim-input-pad-rpath.patch,NONE,1.1
Message-ID: <200602120017.k1C0HX3S013164@cvs-int.fedora.redhat.com>

Author: ryo

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

Added Files:
	scim-input-pad-rpath.patch 
Log Message:
upload the patch file


scim-input-pad-rpath.patch:

--- NEW FILE scim-input-pad-rpath.patch ---
--- m4/lib-link.m4.old	2006-02-12 08:56:53.108198906 +0900
+++ m4/lib-link.m4	2006-02-12 09:01:02.770589904 +0900
@@ -114,9 +114,9 @@
   hardcode_direct="$acl_cv_hardcode_direct"
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
+  AC_ARG_ENABLE(enable-rpath,
     [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
+    [enable_rpath=$enableval], [enable_rpath=yes])
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and



From fedora-extras-commits at redhat.com  Sun Feb 12 00:25:53 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 11 Feb 2006 19:25:53 -0500
Subject: rpms/scim-input-pad/FC-4 .cvsignore, 1.1, 1.2 scim-input-pad.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200602120026.k1C0QQun013351@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-input-pad/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13327

Modified Files:
	.cvsignore scim-input-pad.spec sources 
Log Message:
a litte cleanup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2005 12:34:45 -0000	1.1
+++ .cvsignore	12 Feb 2006 00:25:44 -0000	1.2
@@ -0,0 +1 @@
+scim-input-pad-rpath.patch


Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-4/scim-input-pad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim-input-pad.spec	23 Dec 2005 10:18:50 -0000	1.3
+++ scim-input-pad.spec	12 Feb 2006 00:25:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -9,6 +9,8 @@
 Source0:        http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         scim-input-pad-rpath.patch
+
 BuildRequires:  scim-devel
 Requires:       scim
 
@@ -17,10 +19,11 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -28,8 +31,8 @@
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
-rm ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
 
 %find_lang %{name}
 
@@ -46,7 +49,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog
+%doc COPYING README ChangeLog
 %{_bindir}/scim-input-pad
 %{_libdir}/libscim-input-pad.so.*
 %{_libdir}/scim-1.0/Helper/input-pad.so
@@ -56,7 +59,10 @@
 
 
 %changelog
-* Fri Dec 23 2005 Ryo Dairiki 
+* Sun Feb 12 2006 Ryo Dairiki  - 0.1.1-2
+- a little cleanup
+
+* Fri Dec 23 2005 Ryo Dairiki  - 0.1.1-1
 - update to 0.1.1
 - get rid of the patch for irregal casting
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Dec 2005 10:18:50 -0000	1.3
+++ sources	12 Feb 2006 00:25:44 -0000	1.4
@@ -1 +1 @@
-45fc98fadcfdb8351478a2bc8e37b24f  scim-input-pad-0.1.1.tar.gz
+288abe8e31dcb148df79285af93088f1  scim-input-pad-rpath.patch



From fedora-extras-commits at redhat.com  Sun Feb 12 00:29:24 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 11 Feb 2006 19:29:24 -0500
Subject: rpms/scim-input-pad/FC-4 sources,1.4,1.5
Message-ID: <200602120029.k1C0Tjoh013442@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-input-pad/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13425

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Feb 2006 00:25:44 -0000	1.4
+++ sources	12 Feb 2006 00:29:23 -0000	1.5
@@ -1 +1 @@
-288abe8e31dcb148df79285af93088f1  scim-input-pad-rpath.patch
+45fc98fadcfdb8351478a2bc8e37b24f  scim-input-pad-0.1.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Feb 12 00:34:20 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 11 Feb 2006 19:34:20 -0500
Subject: rpms/scim-input-pad/FC-4 scim-input-pad-rpath.patch,NONE,1.1
Message-ID: <200602120034.k1C0YMSX013515@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-input-pad/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13505

Added Files:
	scim-input-pad-rpath.patch 
Log Message:


scim-input-pad-rpath.patch:

--- NEW FILE scim-input-pad-rpath.patch ---
--- m4/lib-link.m4.old	2006-02-12 08:56:53.108198906 +0900
+++ m4/lib-link.m4	2006-02-12 09:01:02.770589904 +0900
@@ -114,9 +114,9 @@
   hardcode_direct="$acl_cv_hardcode_direct"
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
+  AC_ARG_ENABLE(enable-rpath,
     [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
+    [enable_rpath=$enableval], [enable_rpath=yes])
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and



From fedora-extras-commits at redhat.com  Sun Feb 12 00:37:15 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 11 Feb 2006 19:37:15 -0500
Subject: rpms/scim-input-pad/devel .cvsignore,1.1,1.2
Message-ID: <200602120037.k1C0blDI013582@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	.cvsignore 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Oct 2005 12:34:45 -0000	1.1
+++ .cvsignore	12 Feb 2006 00:37:15 -0000	1.2
@@ -0,0 +1 @@
+scim-input-pad-rpath.patch



From fedora-extras-commits at redhat.com  Sun Feb 12 00:39:06 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 11 Feb 2006 19:39:06 -0500
Subject: rpms/scim-input-pad/FC-3 scim-input-pad-rpath.patch, NONE,
	1.1 scim-input-pad.spec, 1.3, 1.4
Message-ID: <200602120039.k1C0dcB3013661@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-input-pad/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13625

Modified Files:
	scim-input-pad.spec 
Added Files:
	scim-input-pad-rpath.patch 
Log Message:
a little cleanup

scim-input-pad-rpath.patch:

--- NEW FILE scim-input-pad-rpath.patch ---
--- m4/lib-link.m4.old	2006-02-12 08:56:53.108198906 +0900
+++ m4/lib-link.m4	2006-02-12 09:01:02.770589904 +0900
@@ -114,9 +114,9 @@
   hardcode_direct="$acl_cv_hardcode_direct"
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
+  AC_ARG_ENABLE(enable-rpath,
     [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
+    [enable_rpath=$enableval], [enable_rpath=yes])
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and


Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-3/scim-input-pad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim-input-pad.spec	23 Dec 2005 10:17:50 -0000	1.3
+++ scim-input-pad.spec	12 Feb 2006 00:39:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -9,6 +9,8 @@
 Source0:        http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         scim-input-pad-rpath.patch
+
 BuildRequires:  scim-devel
 Requires:       scim
 
@@ -17,10 +19,11 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -28,8 +31,8 @@
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
-rm ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
 
 %find_lang %{name}
 
@@ -46,7 +49,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog
+%doc COPYING README ChangeLog
 %{_bindir}/scim-input-pad
 %{_libdir}/libscim-input-pad.so.*
 %{_libdir}/scim-1.0/Helper/input-pad.so
@@ -56,7 +59,10 @@
 
 
 %changelog
-* Fri Dec 23 2005 Ryo Dairiki 
+* Sun Feb 12 2006 Ryo Dairiki  - 0.1.1-2
+- a little cleanup
+
+* Fri Dec 23 2005 Ryo Dairiki  - 0.1.1-1
 - update to 0.1.1
 - get rid of the patch for irregal casting
 



From fedora-extras-commits at redhat.com  Sun Feb 12 00:39:36 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Sat, 11 Feb 2006 19:39:36 -0500
Subject: rpms/gnome-applet-sensors/devel gnome-applet-sensors.spec, 1.4,
	1.5 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200602120040.k1C0e8jn013674@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-sensors/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13648

Modified Files:
	gnome-applet-sensors.spec sources .cvsignore 
Log Message:
* Sat Feb 11 2006 Aaron Kurtz  - 1.6-1
- bump to release 1.6



Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/gnome-applet-sensors.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-applet-sensors.spec	20 Sep 2005 07:26:29 -0000	1.4
+++ gnome-applet-sensors.spec	12 Feb 2006 00:39:36 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           gnome-applet-sensors
-Version:        1.4
+Version:        1.6
 Release:        1%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 
@@ -12,7 +12,13 @@
 
 BuildRequires: gettext
 BuildRequires: gnome-panel-devel >= 2.8
+Requires: lm_sensors
+BuildRequires:  scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
+ExcludeArch: ppc
+# No lm_sensors for ppc, BZ is #181037 
 
 %description
 GNOME Sensors Applet is an applet for the GNOME Panel to display readings
@@ -25,15 +31,19 @@
 Alarms can be set for each sensor to notify the user once a certain value
 has been reached, and can be configured to execute a given command at given
 repeated intervals.
-GNOME HIG v2.0 compliant
+GNOME HIG v2.0 compliant.
 
 
 %prep
 %setup -q -n sensors-applet-%{version}
+chmod -x %{_builddir}/sensors-applet-%{version}/AUTHORS
+chmod -x %{_builddir}/sensors-applet-%{version}/NEWS
+chmod -x %{_builddir}/sensors-applet-%{version}/TODO
+chmod -x %{_builddir}/sensors-applet-%{version}/ChangeLog
 
 %build
 
-%configure
+%configure --disable-scrollkeeper
 make %{?_smp_mflags}
 
 
@@ -44,6 +54,12 @@
 # Note: the find_lang macro requires gettext
 %find_lang sensors-applet
 
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun
+scrollkeeper-update -q || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,12 +69,26 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/pixmaps/*.png
 %{_libdir}/bonobo/servers/*.server
 %{_libexecdir}/*
+%{_datadir}/omf/sensors-applet/
+%{_datadir}/gnome/help/sensors-applet/
+%{_datadir}/pixmaps/sensors-applet/
 
 
 %changelog
+* Sat Feb 11 2006 Aaron Kurtz  - 1.6-1
+- bump to release 1.6
+
+* Sat Feb 11 2006 Aaron Kurtz  - 1.4-4
+- add ExcludeArch due to lack of ppc lm_sensors
+
+* Tue Feb 06 2006 Aaron Kurtz  - 1.4-3
+- make that lm_sensors
+
+* Mon Feb 06 2006 Aaron Kurtz  - 1.4-2
+- add lm-sensors requires
+
 * Tue Sep 20 2005 Aaron Kurtz  - 1.4-1
 - bump to stable release 1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Sep 2005 07:26:29 -0000	1.4
+++ sources	12 Feb 2006 00:39:36 -0000	1.5
@@ -1 +1 @@
-e71ea9fe79cbc281293fa90857a92b04  sensors-applet-1.4.tar.gz
+544d97bb862257c5c9613af5b6e013ce  sensors-applet-1.6.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Sep 2005 07:26:29 -0000	1.4
+++ .cvsignore	12 Feb 2006 00:39:36 -0000	1.5
@@ -1 +1 @@
-sensors-applet-1.4.tar.gz
+sensors-applet-1.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Feb 12 01:03:16 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 11 Feb 2006 20:03:16 -0500
Subject: rpms/scim-skk/devel scim-skk.spec,1.9,1.10
Message-ID: <200602120103.k1C13m4s015616@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	scim-skk.spec 
Log Message:
a little cleanup


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-skk.spec	25 Jan 2006 05:40:30 -0000	1.9
+++ scim-skk.spec	12 Feb 2006 01:03:16 -0000	1.10
@@ -1,6 +1,6 @@
 Name:	    scim-skk
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
@@ -29,7 +29,7 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la
 
 %find_lang %{name}
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Ryo Dairiki  - 0.5.2-2
+- a little cleanup
+
 * Wed Jan 25 2006 Ryo Dairiki  - 0.5.2-1
 - update to 0.5.2
 



From fedora-extras-commits at redhat.com  Sun Feb 12 02:22:57 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 11 Feb 2006 21:22:57 -0500
Subject: rpms/gnonlin - New directory
Message-ID: <200602120222.k1C2Mx3T017693@cvs-int.fedora.redhat.com>

Author: mikep

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

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




From fedora-extras-commits at redhat.com  Sun Feb 12 02:23:03 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 11 Feb 2006 21:23:03 -0500
Subject: rpms/gnonlin/devel - New directory
Message-ID: <200602120223.k1C2N5at017708@cvs-int.fedora.redhat.com>

Author: mikep

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

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




From fedora-extras-commits at redhat.com  Sun Feb 12 02:23:15 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 11 Feb 2006 21:23:15 -0500
Subject: rpms/gnonlin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602120223.k1C2NHI7017742@cvs-int.fedora.redhat.com>

Author: mikep

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 12 02:23:21 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 11 Feb 2006 21:23:21 -0500
Subject: rpms/gnonlin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200602120223.k1C2NNwb017762@cvs-int.fedora.redhat.com>

Author: mikep

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

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


--- NEW 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 Feb 12 02:23:49 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 11 Feb 2006 21:23:49 -0500
Subject: rpms/gnonlin import.log,1.1,1.2
Message-ID: <200602120224.k1C2OLIo017831@cvs-int.fedora.redhat.com>

Author: mikep

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Feb 2006 02:23:15 -0000	1.1
+++ import.log	12 Feb 2006 02:23:49 -0000	1.2
@@ -0,0 +1 @@
+gnonlin-0_10_0_5-3:HEAD:gnonlin-0.10.0.5-3.src.rpm:1139711025



From fedora-extras-commits at redhat.com  Sun Feb 12 02:23:55 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 11 Feb 2006 21:23:55 -0500
Subject: rpms/gnonlin/devel gnonlin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200602120224.k1C2OTNE017835@cvs-int.fedora.redhat.com>

Author: mikep

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

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


--- NEW FILE gnonlin.spec ---
%define		gst_req	0.10.2
Name: 		gnonlin
Version: 	0.10.0.5
Release:	3
Summary: 	GStreamer extension library for non-linear editing

Group: 		System Environment/Libraries
License: 	LGPL
URL:		http://gnonlin.sourceforge.net/
Source:		http://prdownloads.sourceforge.net/gnonlin/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: 	gstreamer-devel >= %{gst_req}

%description
Gnonlin is a library built on top of GStreamer (http://gstreamer.net)
which provides support for writing non-linear audio and video editing
applications. It introduces the concept of a timeline.

%package devel
Summary: 	Development headers for the gnonlin libraries
Group:          Development/Libraries
Requires:       %{name} = %{version}

%description devel
This package provides the necessary development libraries and include
files to allow you to build applications with gnonlin.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/libgnl.la
# Not in Makefile
install -p -D -m 0644 gnl/gnlcomposition.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlcomposition.h
install -p -D -m 0644 gnl/gnlfilesource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlfilesource.h
install -p -D -m 0644 gnl/gnl.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnl.h
install -p -D -m 0644 gnl/gnlmarshal.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlmarshal.h
install -p -D -m 0644 gnl/gnlobject.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlobject.h
install -p -D -m 0644 gnl/gnloperation.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnloperation.h
install -p -D -m 0644 gnl/gnlsource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlsource.h
install -p -D -m 0644 gnl/gnltypes.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnltypes.h
install -p -D -m 0644 gnl/gnlversion.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlversion.h

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING.LIB README
%{_libdir}/gstreamer-0.10/libgnl*

%files devel
%defattr(-, root, root, -)
%{_includedir}/gnl
%{_libdir}/pkgconfig/gnonlin.pc

%changelog
* Wed Feb 08 2006 W. Michael Petullo  0.10.0.5-3
- remove gettext-devel requirement as aclocal and autoconf not run
- remove pre and post requirements
- update URL
- fix Groups
- ensure proper license is included

* Tue Feb 07 2006 W. Michael Petullo  0.10.0.5-2
- remove %%define name
- BuildRequires gettext-devel
- remove gst-register
- rm %%{_libdir}/gstreamer-0.10/libgnl.la after install
- -devel package owns %%{_includedir}/gnl
- avoid %makeinstall
- remove aclocal and autoconf from %%prep

* Mon Jan 23 2006 W. Michael Petullo  0.10.0.5-1
- updated package to 0.10.0.5 and Fedora

* Wed Jun 29 2005 G??tz Waschk  0.2.2-1mdk
- initial package

* Mon Mar 21 2005 Edward Hervey 
- First version of spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Feb 2006 02:23:20 -0000	1.1
+++ .cvsignore	12 Feb 2006 02:23:55 -0000	1.2
@@ -0,0 +1 @@
+gnonlin-0.10.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Feb 2006 02:23:20 -0000	1.1
+++ sources	12 Feb 2006 02:23:55 -0000	1.2
@@ -0,0 +1 @@
+8c8d6935c7c3bdc05321ae85c6449212  gnonlin-0.10.0.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Feb 12 02:29:50 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 11 Feb 2006 21:29:50 -0500
Subject: owners owners.list,1.632,1.633
Message-ID: <200602120230.k1C2UMnL017898@cvs-int.fedora.redhat.com>

Author: mikep

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

Modified Files:
	owners.list 
Log Message:
Added gnonlin entry.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- owners.list	11 Feb 2006 23:42:49 -0000	1.632
+++ owners.list	12 Feb 2006 02:29:49 -0000	1.633
@@ -335,6 +335,7 @@
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Feb 12 03:07:11 2006
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Sat, 11 Feb 2006 22:07:11 -0500
Subject: rpms/perl-Class-MethodMaker/devel .cvsignore, 1.4,
	1.5 perl-Class-MethodMaker.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200602120307.k1C37hM6019830@cvs-int.fedora.redhat.com>

Author: dgregor

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

Modified Files:
	.cvsignore perl-Class-MethodMaker.spec sources 
Log Message:
upgrade to version 2.08


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Mar 2005 01:02:54 -0000	1.4
+++ .cvsignore	12 Feb 2006 03:07:11 -0000	1.5
@@ -1 +1 @@
-Class-MethodMaker-2.06.tar.gz
+Class-MethodMaker-2.08.tar.gz


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Class-MethodMaker.spec	22 May 2005 22:31:03 -0000	1.3
+++ perl-Class-MethodMaker.spec	12 Feb 2006 03:07:11 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
 Name:           perl-Class-MethodMaker
-Version:        2.06
-Release: 3
+Version:        2.08
+Release:        1
 Summary:        Perl module for creating generic object-oriented methods
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Feb 11 2006 Dennis Gregorovic  - 2.08-1
+- Rebuilt for version 2.08 of source
+
 * Sun May 22 2005 Jeremy Katz  - 2.06-3
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Mar 2005 01:02:54 -0000	1.4
+++ sources	12 Feb 2006 03:07:11 -0000	1.5
@@ -1 +1 @@
-21291a8033091c1f77ecdc339e167802  Class-MethodMaker-2.06.tar.gz
+35b65629c3b4a4da3124ddd5c35e8c34  Class-MethodMaker-2.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Feb 12 03:43:48 2006
From: fedora-extras-commits at redhat.com (Dennis Gregorovic (dgregor))
Date: Sat, 11 Feb 2006 22:43:48 -0500
Subject: rpms/perl-Class-MethodMaker/devel perl-Class-MethodMaker.spec, 1.4, 
	1.5
Message-ID: <200602120344.k1C3iK95020006@cvs-int.fedora.redhat.com>

Author: dgregor

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

Modified Files:
	perl-Class-MethodMaker.spec 
Log Message:
update the source to 2.08


Index: perl-Class-MethodMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Class-MethodMaker.spec	12 Feb 2006 03:07:11 -0000	1.4
+++ perl-Class-MethodMaker.spec	12 Feb 2006 03:43:48 -0000	1.5
@@ -8,7 +8,7 @@
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-MethodMaker/
-Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.06.tar.gz
+Source:         http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.08.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1



From fedora-extras-commits at redhat.com  Sun Feb 12 08:52:31 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 12 Feb 2006 03:52:31 -0500
Subject: rpms/docbook2X/FC-4 docbook2X.spec,1.1,1.2
Message-ID: <200602120853.k1C8r36b029631@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	docbook2X.spec 
Log Message:
bump release




Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-4/docbook2X.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docbook2X.spec	9 Feb 2006 21:00:11 -0000	1.1
+++ docbook2X.spec	12 Feb 2006 08:52:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           docbook2X
 Version:        0.8.5
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
@@ -75,5 +75,5 @@
 
 
 %changelog
-* Fri Feb  3 2006 Patrice Dumas  - 0.8.5-1
+* Fri Feb  3 2006 Patrice Dumas  - 0.8.5-1.1
 - FE submission



From fedora-extras-commits at redhat.com  Sun Feb 12 11:16:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Feb 2006 06:16:24 -0500
Subject: rpms/scorched3d/devel scorched3d-opengl-without-context.patch, NONE,
	1.1 scorched3d-64bit.patch, 1.4, 1.5 scorched3d.spec, 1.11, 1.12
Message-ID: <200602121116.k1CBGvIk007050@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	scorched3d-64bit.patch scorched3d.spec 
Added Files:
	scorched3d-opengl-without-context.patch 
Log Message:
* Sun Feb 12 2006  - 39.1-3
- fix server crashing with certain landscape types (patch 13)


scorched3d-opengl-without-context.patch:

--- NEW FILE scorched3d-opengl-without-context.patch ---
diff -ur scorched.orig/src/landscape/LandscapeMaps.cpp scorched/src/landscape/LandscapeMaps.cpp
--- scorched.orig/src/landscape/LandscapeMaps.cpp	2006-02-12 11:09:19.000000000 +0100
+++ scorched/src/landscape/LandscapeMaps.cpp	2006-02-12 10:27:33.000000000 +0100
@@ -92,7 +92,8 @@
 
 void LandscapeMaps::generateObjects(
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	LandscapeTex *tex = &getTex(context);
 
@@ -115,7 +114,7 @@
 			}
 			RandomGenerator objectsGenerator;
 			objectsGenerator.seed(getSeed());
-			objects_.generate(objectsGenerator, *place, context, counter);
+			objects_.generate(objectsGenerator, *place, context, counter, server);
 		}
 	}
 }
diff -ur scorched.orig/src/landscape/LandscapeMaps.h scorched/src/landscape/LandscapeMaps.h
--- scorched.orig/src/landscape/LandscapeMaps.h	2005-06-13 10:24:37.000000000 +0200
+++ scorched/src/landscape/LandscapeMaps.h	2006-02-12 10:23:51.000000000 +0100
@@ -57,7 +57,8 @@
 		LandscapeDefinition *hdef,
 		ProgressCounter *counter = 0);
 	void generateObjects(ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 
 	// Compresses the level into a form that can be
 	// sent to the clients
diff -ur scorched.orig/src/landscape/LandscapeObjects.cpp scorched/src/landscape/LandscapeObjects.cpp
--- scorched.orig/src/landscape/LandscapeObjects.cpp	2005-07-17 13:32:05.000000000 +0200
+++ scorched/src/landscape/LandscapeObjects.cpp	2006-02-12 10:36:17.000000000 +0100
@@ -111,7 +111,8 @@
 void LandscapeObjects::generate(RandomGenerator &generator, 
 	LandscapePlace &place,
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	if (counter) counter->setNewOp("Populating Landscape");
 
@@ -130,7 +131,7 @@
 			LandscapePlaceObjectsPlacementTree *placement =
 				(LandscapePlaceObjectsPlacementTree *)
 					place.objects[i];
-			gen.generateObjects(generator, *placement, context, counter);
+			gen.generateObjects(generator, *placement, context, counter, server);
 		}
 		else if (0 == strcmp(placementtype.c_str(), "mask"))
 		{
@@ -139,7 +140,7 @@
 			LandscapePlaceObjectsPlacementMask *placement =
 				(LandscapePlaceObjectsPlacementMask *)
 					place.objects[i];
-			gen.generateObjects(generator, *placement, context, counter);
+			gen.generateObjects(generator, *placement, context, counter, server);
 		}
 		else if (0 == strcmp(placementtype.c_str(), "direct"))
 		{
@@ -148,7 +149,7 @@
 			LandscapePlaceObjectsPlacementDirect *placement =
 				(LandscapePlaceObjectsPlacementDirect *)
 					place.objects[i];
-			gen.generateObjects(generator, *placement, context, counter);
+			gen.generateObjects(generator, *placement, context, counter, server);
 		}
 		else
 		{
diff -ur scorched.orig/src/landscape/LandscapeObjects.h scorched/src/landscape/LandscapeObjects.h
--- scorched.orig/src/landscape/LandscapeObjects.h	2005-07-17 13:32:05.000000000 +0200
+++ scorched/src/landscape/LandscapeObjects.h	2006-02-12 10:28:11.000000000 +0100
@@ -40,7 +40,8 @@
 	void generate(RandomGenerator &generator, 
 		LandscapePlace &place,
 		ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 
 	void removeAllObjects();
 	void removeObjects(ScorchedContext &context,
diff -ur scorched.orig/src/landscape/LandscapeObjectsPlacement.cpp scorched/src/landscape/LandscapeObjectsPlacement.cpp
--- scorched.orig/src/landscape/LandscapeObjectsPlacement.cpp	2006-02-12 11:09:19.000000000 +0100
+++ scorched/src/landscape/LandscapeObjectsPlacement.cpp	2006-02-12 10:45:42.000000000 +0100
@@ -34,7 +34,8 @@
 	RandomGenerator &generator, 
 	LandscapePlaceObjectsPlacementTree &placement,
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	// Generate a map of where the trees should go
 	unsigned char objectMap[64 * 64];
@@ -164,7 +165,12 @@
 			placement.objecttype.c_str());
 	}
 
-	float mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
+	float mult;
+	// Do not draw/use Landscape::instance()->getMainMap() when running
+	// as server, because LandScape uses openGL functions and the server
+	// does not have an openGL context set.
+	if (!server)
+		mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
 
 	LandscapeObjectsGroupEntry *group = 0;
 	if (placement.groupname.c_str()[0])
@@ -219,8 +226,12 @@
 					//Vector position(entry->posX, entry->posY, entry->posZ);
 					//DeformLandscape::flattenArea(context, position, 0);
 
-					GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-						lx * mult, ly * mult, modelSize * entry->size * mult, 1.0f);
+					// Do not draw/use Landscape::instance()->getMainMap() when running
+					// as server, because LandScape uses openGL functions and the server
+					// does not have an openGL context set.
+					if (!server)
+						GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+							lx * mult, ly * mult, modelSize * entry->size * mult, 1.0f);
 				}
 				else
 				{
@@ -237,8 +248,12 @@
 					entry->removeaction = placement.removeaction;
 					entry->burnaction = placement.burnaction;				
 					
-					GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-						lx * mult, ly * mult, entry->size * mult, 1.0f);
+					// Do not draw/use Landscape::instance()->getMainMap() when running
+					// as server, because LandScape uses openGL functions and the server
+					// does not have an openGL context set.
+					if (!server)
+						GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+							lx * mult, ly * mult, entry->size * mult, 1.0f);
 				}
 
 				context.landscapeMaps->getObjects().addObject(
@@ -260,7 +275,8 @@
 	RandomGenerator &generator, 
 	LandscapePlaceObjectsPlacementMask &placement,
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	bool pine = true;
 	float snowHeight = 20.0f;
@@ -313,10 +329,14 @@
 			placement.groupname.c_str(), true);
 	}
 
-	float mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
-
+	float mult; 
 	const int NoIterations = placement.numobjects;
 	int objectCount = 0;
+	// Do not draw/use Landscape::instance()->getMainMap() when running
+	// as server, because LandScape uses openGL functions and the server
+	// does not have an openGL context set.
+	if (!server)
+		mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
 	for (int i=0; iposX, entry->posY, entry->posZ);
 						//DeformLandscape::flattenArea(context, position, 0);
 
-						GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-							lx * mult, ly * mult, modelSize * entry->size * mult, 1.0f);
+						// Do not draw/use Landscape::instance()->getMainMap() when running
+						// as server, because LandScape uses openGL functions and the server
+						// does not have an openGL context set.
+						if (!server)
+							GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+								lx * mult, ly * mult, modelSize * entry->size * mult, 1.0f);
 					}
 					else
 					{
@@ -420,8 +444,12 @@
 						entry->removeaction = placement.removeaction;
 						entry->burnaction = placement.burnaction;
 						
-						GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-							lx * mult, ly * mult, entry->size * mult, 1.0f);
+						// Do not draw/use Landscape::instance()->getMainMap() when running
+						// as server, because LandScape uses openGL functions and the server
+						// does not have an openGL context set.
+						if (!server)
+							GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+								lx * mult, ly * mult, entry->size * mult, 1.0f);
 					}
 
 					context.landscapeMaps->getObjects().addObject(
@@ -444,7 +472,8 @@
 	RandomGenerator &generator, 
 	LandscapePlaceObjectsPlacementDirect &placement,
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	bool pine = true;
 	float snowHeight = 20.0f;
@@ -489,7 +518,12 @@
 			placement.groupname.c_str(), true);
 	}
 
-	float mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
+	float mult;
+	// Do not draw/use Landscape::instance()->getMainMap() when running
+	// as server, because LandScape uses openGL functions and the server
+	// does not have an openGL context set.
+	if (!server)
+		mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
 
 	std::list::iterator itor;
 	int i = 0;
@@ -526,9 +560,13 @@
 			//Vector position(entry->posX, entry->posY, entry->posZ);
 			//DeformLandscape::flattenArea(context, position, 0);
 
-			GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-				position.position[0] * mult, position.position[1] * mult, 
-				modelSize * entry->size * mult, 1.0f);
+			// Do not draw/use Landscape::instance()->getMainMap() when running
+			// as server, because LandScape uses openGL functions and the server
+			// does not have an openGL context set.
+			if (!server)
+				GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+					position.position[0] * mult, position.position[1] * mult, 
+					modelSize * entry->size * mult, 1.0f);
 		}
 		else
 		{
@@ -545,9 +583,13 @@
 			entry->removeaction = placement.removeaction;
 			entry->burnaction = placement.burnaction;
 			
-			GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-				position.position[0] * mult, position.position[1] * mult, 
-				entry->size * mult, 1.0f);
+			// Do not draw/use Landscape::instance()->getMainMap() when running
+			// as server, because LandScape uses openGL functions and the server
+			// does not have an openGL context set.
+			if (!server)
+				GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+					position.position[0] * mult, position.position[1] * mult, 
+					entry->size * mult, 1.0f);
 		}
 
 		context.landscapeMaps->getObjects().addObject(
diff -ur scorched.orig/src/landscape/LandscapeObjectsPlacement.h scorched/src/landscape/LandscapeObjectsPlacement.h
--- scorched.orig/src/landscape/LandscapeObjectsPlacement.h	2005-06-15 16:21:59.000000000 +0200
+++ scorched/src/landscape/LandscapeObjectsPlacement.h	2006-02-12 10:35:17.000000000 +0100
@@ -33,7 +33,8 @@
 		RandomGenerator &generator, 
 		LandscapePlaceObjectsPlacementTree &placement,
 		ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 };
 
 class LandscapePlaceObjectsPlacementMask;
@@ -44,7 +45,8 @@
 		RandomGenerator &generator, 
 		LandscapePlaceObjectsPlacementMask &placement,
 		ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 };
 
 class LandscapePlaceObjectsPlacementDirect;
@@ -55,7 +57,8 @@
 		RandomGenerator &generator, 
 		LandscapePlaceObjectsPlacementDirect &placement,
 		ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 };
 
 #endif // __INCLUDE_LandscapeObjectsPlacementh_INCLUDE__
diff -ur scorched.orig/src/server/ServerNewGameState.cpp scorched/src/server/ServerNewGameState.cpp
--- scorched.orig/src/server/ServerNewGameState.cpp	2006-02-12 11:09:19.000000000 +0100
+++ scorched/src/server/ServerNewGameState.cpp	2006-02-12 10:24:15.000000000 +0100
@@ -133,7 +133,7 @@
 	ScorchedServer::instance()->getContext().landscapeMaps->generateHMap(
 		ScorchedServer::instance()->getContext(), defn);
 	ScorchedServer::instance()->getContext().landscapeMaps->generateObjects(
-		ScorchedServer::instance()->getContext());
+		ScorchedServer::instance()->getContext(), 0, 1);
 
 	// Set the start positions for the tanks
 	// Must be generated after the level as it alters the

scorched3d-64bit.patch:

Index: scorched3d-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-64bit.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scorched3d-64bit.patch	9 Feb 2006 21:57:31 -0000	1.4
+++ scorched3d-64bit.patch	12 Feb 2006 11:16:24 -0000	1.5
@@ -1,16 +1,3 @@
-Only in scorched/data/globalmods/apoc/data/accessories/weapons: moab.txt.cvs
-diff -ur scorched.orig/src/GLEXT/GLTexture.cpp scorched/src/GLEXT/GLTexture.cpp
---- scorched.orig/src/GLEXT/GLTexture.cpp	2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/GLEXT/GLTexture.cpp	2006-02-09 14:47:28.000000000 +0100
-@@ -119,7 +119,7 @@
- 		if (height == 1 || width == 1) texType_ = GL_TEXTURE_1D;
- 		else texType_ = GL_TEXTURE_2D;
- 
--		if (!textureValid())
-+		if (!texNum_ || !textureValid())
- 		{
- 			GLfloat priority = 1.0f;
- 			glGenTextures(1, &texNum_);
 diff -ur scorched.orig/src/client/ClientConnectionAcceptHandler.cpp scorched/src/client/ClientConnectionAcceptHandler.cpp
 --- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp	2006-02-09 14:52:14.000000000 +0100
 +++ scorched/src/client/ClientConnectionAcceptHandler.cpp	2006-02-09 14:47:28.000000000 +0100


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scorched3d.spec	11 Feb 2006 19:33:16 -0000	1.11
+++ scorched3d.spec	12 Feb 2006 11:16:24 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        39.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 
 Group:          Amusements/Games
@@ -21,6 +21,7 @@
 Patch10:        %{name}-negint.patch
 Patch11:        %{name}-XML-injection.patch
 Patch12:        %{name}-HTML-injection.patch
+Patch13:        %{name}-opengl-without-context.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
@@ -69,6 +70,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 . autogen.sh
 
 
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Sun Feb 12 2006  - 39.1-3
+- fix server crashing with certain landscape types (patch 13)
+
 * Sat Feb 11 2006  - 39.1-2
 - upgrade to CVS snapshot of 20050929, as Debian does, but not to
   the newer apoc version as this causes problems playing online (patch 0)



From fedora-extras-commits at redhat.com  Sun Feb 12 11:52:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 12 Feb 2006 06:52:12 -0500
Subject: rpms/amarok/devel amarok.spec,1.35,1.36
Message-ID: <200602121152.k1CBqias007179@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
fix BR for gstreamer < 0.10


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- amarok.spec	22 Jan 2006 09:07:44 -0000	1.35
+++ amarok.spec	12 Feb 2006 11:52:12 -0000	1.36
@@ -7,7 +7,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.3.8
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -28,8 +28,11 @@
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
+BuildRequires:  alsa-lib-devel
 %if "%fedora" >= "5"
-BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
+# Support for gstreamer 0.10 is not there yet
+#BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
+BuildRequires:  gstreamer08-plugins-devel
 %else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 %endif
@@ -220,6 +223,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Aurelien Bompard  1.3.8-2
+- fix BR for gstreamer < 0.10
+
 * Sat Jan 21 2006 Aurelien Bompard  1.3.8-1
 - version 1.3.8
 



From fedora-extras-commits at redhat.com  Sun Feb 12 14:19:43 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 12 Feb 2006 09:19:43 -0500
Subject: rpms/dejavu-fonts import.log,1.30,1.31
Message-ID: <200602121420.k1CEKFTZ013270@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13236

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-4.fc5 on branch devel from dejavu-fonts-2.2-4.fc5.src.rpm
initial build from sfd package, is not expected to build before bug #181052 is fixed


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- import.log	17 Jan 2006 23:50:46 -0000	1.30
+++ import.log	12 Feb 2006 14:19:42 -0000	1.31
@@ -27,3 +27,4 @@
 dejavu-fonts-2_2-3_fc5:HEAD:dejavu-fonts-2.2-3.fc5.src.rpm:1137444196
 dejavu-fonts-2_2-3_fc4:FC-4:dejavu-fonts-2.2-3.fc4.src.rpm:1137541581
 dejavu-fonts-2_2-3_fc3:FC-3:dejavu-fonts-2.2-3.fc3.src.rpm:1137541836
+dejavu-fonts-2_2-4_fc5:HEAD:dejavu-fonts-2.2-4.fc5.src.rpm:1139753973



From fedora-extras-commits at redhat.com  Sun Feb 12 14:19:49 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 12 Feb 2006 09:19:49 -0500
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.8, 1.9 dejavu-fonts.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200602121420.k1CEKLYQ013275@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13236/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.2-4.fc5 on branch devel from dejavu-fonts-2.2-4.fc5.src.rpm
initial build from sfd package, is not expected to build before bug #181052 is fixed


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jan 2006 06:32:05 -0000	1.8
+++ .cvsignore	12 Feb 2006 14:19:49 -0000	1.9
@@ -1 +1 @@
-dejavu-ttf-2.2.tar.gz
+dejavu-sfd-2.2.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dejavu-fonts.spec	16 Jan 2006 20:43:32 -0000	1.10
+++ dejavu-fonts.spec	12 Feb 2006 14:19:49 -0000	1.11
@@ -1,15 +1,25 @@
-%define archivename     dejavu-ttf
+%define archivename     dejavu-sfd
 %define fontdir         %{_datadir}/fonts/dejavu
 
+# Let the perl Maintainer worry about Unicode.org data files (updates, licensing)
+%define Blocks		%(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
+%define UnicodeData	%(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
+
 Name:      dejavu-fonts
 Version:   2.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
-Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
+Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# See bug #181052
+BuildRequires: fontforge >= 20060209
+# The CPAN sources do not declare perl(Font::TTF)
+BuildRequires: perl-Font-TTF
+# Needed to compute unicode coverage
+BuildRequires: %{Blocks} %{UnicodeData}
 BuildArch: noarch
 Conflicts: fontconfig < 2.3.93
 
@@ -23,13 +33,25 @@
 %setup -q -n %{archivename}-%{version}
 
 %build
+./generate.sh
+./status.pl %{version} status.txt *.sfd > status.txt.new
+mv status.txt.new status.txt
+./unicover.pl %{UnicodeData} %{Blocks} \
+              DejaVuSans.sfd Sans \
+              DejaVuSerif.sfd Serif \
+              DejaVuMonoSans.sfd "Sans Mono" > unicover.txt
+
+%check
+# Current upstream files are full of "problems"
+# Do not panic if the output is long
+./problems.pl -l 3 *.sfd
 
 %install
 /bin/rm -rf %{buildroot}
 
 #fonts
 install -d -m 0755 %{buildroot}%{fontdir}
-install -m 0644 *.ttf  %{buildroot}%{fontdir}
+install -m 0644 generated/*.ttf  %{buildroot}%{fontdir}
 
 %clean
 /bin/rm -rf %{buildroot}
@@ -52,11 +74,14 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
-
 %dir %{fontdir}
 %{fontdir}/*.ttf
 
 %changelog
+* Sun Feb 12 2006 Nicolas Mailhot  2.2-4
+- WARNING: in an effort to get Fedora Extras as self-hosting as possible
+  starting from this release ttf files are regenerated from sfd sources
+
 * Mon Jan 16 2006 Nicolas Mailhot  2.2-2
 - bump release to ensure graceful FC4 -> FC5 update
 - bump again because of bas CVS tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jan 2006 06:32:05 -0000	1.8
+++ sources	12 Feb 2006 14:19:49 -0000	1.9
@@ -1 +1 @@
-cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz
+c37ef5e2a5f8d8a8de55fe87cfb84739  dejavu-sfd-2.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Feb 12 15:16:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Feb 2006 10:16:40 -0500
Subject: rpms/xemacs-sumo/devel xemacs-sumo-jde-mktoc.pl, NONE,
	1.1 .cvsignore, 
	1.7, 1.8 sources, 1.7, 1.8 xemacs-sumo.spec, 1.14, 1.15
Message-ID: <200602121517.k1CFHCrG015328@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15287

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Added Files:
	xemacs-sumo-jde-mktoc.pl 
Log Message:
* Sat Feb 11 2006 Ville Skytt?? 
- Bundle upstream gnus package version 1.89 to fix #181011.
- Get rid of tli_rbl binary only applet jar in jde's docs (first step
  of fixing #180941).



--- NEW FILE xemacs-sumo-jde-mktoc.pl ---
#!/usr/bin/perl -w

my $indent = 0;

my $tochtml = $ARGV[0];
my $toctxt  = $ARGV[1];

open(HTML, $tochtml) or die "Can't read $tochtml: $!";
open(TXT,  $toctxt)  or die "Can't read $toctxt: $!";

while () {
  if (/
ul { margin-left: 0; padding-left: 1em; }
li { font-size: smaller; }

EOF

print "
      \n";
while () {
  my ($level, $title, undef, $link) =
    /^(\d+)\s*;\s*(.*?)\s*;\s*(\d+)\s*;\s*\.\.\/html\/[^\/]+\/(.+)\s*/ or next;
  print "
    \n" x ($indent - $level) if ($indent > $level);
  print "
      \n" x ($level - $indent) if ($indent < $level);
  print "
    • ", $title, "
      • \n";
  $indent = $level;
}
print "
    \n\n\n";

close(TXT);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Dec 2005 21:06:20 -0000	1.7
+++ .cvsignore	12 Feb 2006 15:16:39 -0000	1.8
@@ -1,2 +1,3 @@
 xemacs-mule-sumo-2005-12-08.tar.bz2
 xemacs-sumo-2005-12-08.tar.bz2
+gnus-1.89-pkg.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Dec 2005 21:06:20 -0000	1.7
+++ sources	12 Feb 2006 15:16:39 -0000	1.8
@@ -1,2 +1,3 @@
 553da38bc36b4365ab98e0565a0530b8  xemacs-mule-sumo-2005-12-08.tar.bz2
 1927c40affd04ff7c10b979ef24548d0  xemacs-sumo-2005-12-08.tar.bz2
+e7707178416716eac643af29c437f619  gnus-1.89-pkg.tar.gz


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xemacs-sumo.spec	23 Dec 2005 17:41:33 -0000	1.14
+++ xemacs-sumo.spec	12 Feb 2006 15:16:39 -0000	1.15
@@ -11,6 +11,7 @@
 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
@@ -19,6 +20,7 @@
 Source15:       Emacs.ad.ko_KR.UTF-8
 Source16:       Emacs.ad.zh_CN.UTF-8
 Source17:       Emacs.ad.zh_TW.UTF-8
+Source20:       %{name}-jde-mktoc.pl
 Patch0:         %{name}-20051208-hypb-posix.patch
 Patch1:         %{name}-20051208-pydoc-path.patch
 Patch2:         %{name}-20051208-latin-unity-kludge.patch
@@ -37,6 +39,7 @@
 BuildRequires:  sed >= 3.95
 BuildRequires:  /sbin/install-info
 BuildRequires:  %{__python}
+BuildRequires:  %{__perl}
 Requires:       xemacs-common
 # Fake release in this provision in order to avoid self-obsoletion (for now).
 Provides:       apel-xemacs = 10.6-6
@@ -81,6 +84,8 @@
 
 %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
@@ -115,6 +120,17 @@
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
 
+# get rid of binary-only tli_rbl treeview applet + some cruft in jde docs
+cd xemacs-packages/etc/jde/doc
+for foo in jdebug jde ; do
+    %{__perl} %{SOURCE20} \
+        html/$foo-ug/$foo-ug-toc.html tli_rbl/txt/$foo-ug-toc.txt \
+        > html/$foo-ug/$foo-ug-toc.html.tmp
+    mv html/$foo-ug/$foo-ug-toc.html.tmp html/$foo-ug/$foo-ug-toc.html
+done
+rm -rf tli_rbl src
+cd -
+
 
 %build
 export xemacs_batch="xemacs-nox -batch -vanilla"
@@ -211,6 +227,11 @@
 
 
 %changelog
+* Sat Feb 11 2006 Ville Skytt?? 
+- Bundle upstream gnus package version 1.89 to fix #181011.
+- Get rid of tli_rbl binary only applet jar in jde's docs (first step
+  of fixing #180941).
+
 * Sat Dec 17 2005 Ville Skytt??  - 20051208-1
 - Patch to support write-region's kludge in latin-unity.
 



From fedora-extras-commits at redhat.com  Sun Feb 12 15:48:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Feb 2006 10:48:26 -0500
Subject: rpms/bash-completion/FC-3 bash-completion.spec,1.7,1.8
Message-ID: <200602121548.k1CFmw0x015416@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	bash-completion.spec 
Log Message:
* Sun Feb 12 2006 Ville Skytt??  - 20050721-4.1
- Revert back to expanded triggers, rpmbuild < 4.4 doesn't like the
  macroized syntax.



Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/bash-completion.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bash-completion.spec	11 Feb 2006 10:05:59 -0000	1.7
+++ bash-completion.spec	12 Feb 2006 15:48:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050721
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -58,34 +58,138 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%define bashcomp_trigger() \
-%triggerin -- %1\
-if [ ! -e %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1} ] ; then\
-  ln -s %{_datadir}/%{name}/%{?2}%{!?2:%1} %{_sysconfdir}/bash_completion.d\
-fi\
-%triggerun -- %1\
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1}\
-%{nil}
-
-%bashcomp_trigger bittorrent
-%bashcomp_trigger cksfv
-%bashcomp_trigger clisp
-%bashcomp_trigger freeciv
-%bashcomp_trigger gcc-gnat gnatmake
-%bashcomp_trigger gkrellm
-%bashcomp_trigger mailman
-%bashcomp_trigger mcrypt
-%bashcomp_trigger mock
-%bashcomp_trigger mtx
-%bashcomp_trigger plague-client
-%bashcomp_trigger ruby-ri ri
-%bashcomp_trigger sbcl
-%bashcomp_trigger snownews
-%bashcomp_trigger subversion
-%bashcomp_trigger unace
-%bashcomp_trigger unixODBC isql
-%bashcomp_trigger unrar
-%bashcomp_trigger yum-utils repomanage
+%triggerin -- bittorrent
+if [ ! -e %{_sysconfdir}/bash_completion.d/bittorrent ] ; then
+  ln -s %{_datadir}/%{name}/bittorrent %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- bittorrent
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/bittorrent
+
+%triggerin -- cksfv
+if [ ! -e %{_sysconfdir}/bash_completion.d/cksfv ] ; then
+  ln -s %{_datadir}/%{name}/cksfv %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- cksfv
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/cksfv
+
+%triggerin -- clisp
+if [ ! -e %{_sysconfdir}/bash_completion.d/clisp ] ; then
+  ln -s %{_datadir}/%{name}/clisp %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- clisp
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/clisp
+
+%triggerin -- freeciv
+if [ ! -e %{_sysconfdir}/bash_completion.d/freeciv ] ; then
+  ln -s %{_datadir}/%{name}/freeciv %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- freeciv
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/freeciv
+
+%triggerin -- gcc-gnat
+if [ ! -e %{_sysconfdir}/bash_completion.d/gnatmake ] ; then
+  ln -s %{_datadir}/%{name}/gnatmake %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- gcc-gnat
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gnatmake
+
+%triggerin -- gkrellm
+if [ ! -e %{_sysconfdir}/bash_completion.d/gkrellm ] ; then
+  ln -s %{_datadir}/%{name}/gkrellm %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- gkrellm
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gkrellm
+
+%triggerin -- mailman
+if [ ! -e %{_sysconfdir}/bash_completion.d/mailman ] ; then
+  ln -s %{_datadir}/%{name}/mailman %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- mailman
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mailman
+
+%triggerin -- mcrypt
+if [ ! -e %{_sysconfdir}/bash_completion.d/mcrypt ] ; then
+  ln -s %{_datadir}/%{name}/mcrypt %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- mcrypt
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mcrypt
+
+%triggerin -- mock
+if [ ! -e %{_sysconfdir}/bash_completion.d/mock ] ; then
+  ln -s %{_datadir}/%{name}/mock %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- mock
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mock
+
+%triggerin -- mtx
+if [ ! -e %{_sysconfdir}/bash_completion.d/mtx ] ; then
+  ln -s %{_datadir}/%{name}/mtx %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- mtx
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mtx
+
+%triggerin -- plague-client
+if [ ! -e %{_sysconfdir}/bash_completion.d/plague-client ] ; then
+  ln -s %{_datadir}/%{name}/plague-client %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- plague-client
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/plague-client
+
+%triggerin -- ruby-ri
+if [ ! -e %{_sysconfdir}/bash_completion.d/ri ] ; then
+  ln -s %{_datadir}/%{name}/ri %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- ruby-ri
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/ri
+
+%triggerin -- sbcl
+if [ ! -e %{_sysconfdir}/bash_completion.d/sbcl ] ; then
+  ln -s %{_datadir}/%{name}/sbcl %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- sbcl
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/sbcl
+
+%triggerin -- snownews
+if [ ! -e %{_sysconfdir}/bash_completion.d/snownews ] ; then
+  ln -s %{_datadir}/%{name}/snownews %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- snownews
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/snownews
+
+%triggerin -- subversion
+if [ ! -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
+  ln -s %{_datadir}/%{name}/subversion %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- subversion
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/subversion
+
+%triggerin -- unace
+if [ ! -e %{_sysconfdir}/bash_completion.d/unace ] ; then
+  ln -s %{_datadir}/%{name}/unace %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- unace
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unace
+
+%triggerin -- unixODBC
+if [ ! -e %{_sysconfdir}/bash_completion.d/isql ] ; then
+  ln -s %{_datadir}/%{name}/isql %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- unixODBC
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/isql
+
+%triggerin -- unrar
+if [ ! -e %{_sysconfdir}/bash_completion.d/unrar ] ; then
+  ln -s %{_datadir}/%{name}/unrar %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- unrar
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unrar
+
+%triggerin -- yum-utils
+if [ ! -e %{_sysconfdir}/bash_completion.d/repomanage ] ; then
+  ln -s %{_datadir}/%{name}/repomanage %{_sysconfdir}/bash_completion.d
+fi
+%triggerun -- yum-utils
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/repomanage
 
 
 %files -f %{name}-ghosts.list
@@ -98,6 +202,10 @@
 
 
 %changelog
+* Sun Feb 12 2006 Ville Skytt??  - 20050721-4.1
+- Revert back to expanded triggers, rpmbuild < 4.4 doesn't like the
+  macroized syntax.
+
 * Wed Feb  8 2006 Ville Skytt??  - 20050721-4
 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
 - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.



From fedora-extras-commits at redhat.com  Sun Feb 12 16:27:55 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 12 Feb 2006 11:27:55 -0500
Subject: rpms/kover/devel kover.spec,1.9,1.10
Message-ID: <200602121628.k1CGSRRH017547@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	kover.spec 
Log Message:
* Sun Feb 12 2006 Adrian Reber  - 2.9.6-4
- rebuilt



Index: kover.spec
===================================================================
RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kover.spec	23 May 2005 00:14:04 -0000	1.9
+++ kover.spec	12 Feb 2006 16:27:55 -0000	1.10
@@ -1,14 +1,14 @@
 Name: kover
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 2.9.6
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/Publishing
 Source0 http://lisas.de/kover/kover-2.9.6.tar.gz
 Source1: http://lisas.de/kover/kover-2.9.6.tar.gz.asc
 URL: http://lisas.de/kover/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext, XFree86-devel, zlib-devel, qt-devel >= 1:3.0.3
+BuildRequires: gettext, zlib-devel, qt-devel >= 1:3.0.3
 BuildRequires: libjpeg-devel, kdelibs-devel, arts-devel, desktop-file-utils
 BuildRequires: libart_lgpl-devel, libpng-devel
 
@@ -58,6 +58,9 @@
 %attr(755,root,root)%{_bindir}/cd-text
 
 %changelog
+* Sun Feb 12 2006 Adrian Reber  - 2.9.6-4
+- rebuilt
+
 * Sun May 22 2005 Jeremy Katz  - 2.9.6-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sun Feb 12 18:09:22 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Sun, 12 Feb 2006 13:09:22 -0500
Subject: rpms/gnome-applet-sensors/devel gnome-applet-sensors.spec,1.5,1.6
Message-ID: <200602121809.k1CI9snG021641@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-sensors/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21619

Modified Files:
	gnome-applet-sensors.spec 
Log Message:
* Sat Feb 11 2006 Aaron Kurtz  - 1.6-2
- fix gnome-doc-utils requirement



Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/gnome-applet-sensors.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-applet-sensors.spec	12 Feb 2006 00:39:36 -0000	1.5
+++ gnome-applet-sensors.spec	12 Feb 2006 18:09:21 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gnome-applet-sensors
 Version:        1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 
 Group:          User Interface/Desktops
@@ -10,7 +10,7 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gettext
+BuildRequires: gettext, gnome-doc-utils
 BuildRequires: gnome-panel-devel >= 2.8
 Requires: lm_sensors
 BuildRequires:  scrollkeeper
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sat Feb 11 2006 Aaron Kurtz  - 1.6-2
+- fix gnome-doc-utils requirement
+
 * Sat Feb 11 2006 Aaron Kurtz  - 1.6-1
 - bump to release 1.6
 



From fedora-extras-commits at redhat.com  Sun Feb 12 19:18:34 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 12 Feb 2006 14:18:34 -0500
Subject: rpms/blender/devel blender.spec,1.17,1.18
Message-ID: <200602121919.k1CJJ6Ns023830@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	blender.spec 
Log Message:

  Description:
    Preperation for FC5 mass rebuild.



Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blender.spec	6 Feb 2006 21:20:03 -0000	1.17
+++ blender.spec	12 Feb 2006 19:18:33 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           blender
 Version:        2.41
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Jochen Schmitt  2.41-3
+- Rebuild for FC5
+
 * Mon Feb  6 2006 Jochen Schmitt  2.41-2
 - Add freealut as dependancy.
 



From fedora-extras-commits at redhat.com  Sun Feb 12 19:21:35 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 12 Feb 2006 14:21:35 -0500
Subject: rpms/highlight/devel highlight.spec,1.9,1.10
Message-ID: <200602121922.k1CJM72J023891@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	highlight.spec 
Log Message:

  Description:
    Preperation for mass rebuild for FC5.



Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- highlight.spec	1 Nov 2005 15:55:32 -0000	1.9
+++ highlight.spec	12 Feb 2006 19:21:35 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.4.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPL
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Sun Feb 12 2006 Jochen Schmitt  2.4.3-2
+- Rebuilt for FC5
+
 * Tue Nov  1 2005 Jochen Schmitt  2.4.3-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Feb 12 19:24:24 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 12 Feb 2006 14:24:24 -0500
Subject: rpms/inadyn/devel inadyn.spec,1.13,1.14
Message-ID: <200602121924.k1CJOuoV023963@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	inadyn.spec 
Log Message:

  Description:
    Preperation for mass rebuild for FC5.



Index: inadyn.spec
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- inadyn.spec	24 Oct 2005 16:28:46 -0000	1.13
+++ inadyn.spec	12 Feb 2006 19:24:23 -0000	1.14
@@ -1,7 +1,7 @@
 Name:           inadyn
 
 Version:        1.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Dynamic DNS Client
 
@@ -82,6 +82,9 @@
 %config %{_sysconfdir}/inadyn.conf
 
 %changelog
+* Sun Feb 12 2006 Jochen Schmitt  1.96-2
+- Rebuilt for FC5
+
 * Mon Oct 24 2005 Jochen Schmitt  1.96-1
 - New upstream relase
 



From fedora-extras-commits at redhat.com  Sun Feb 12 19:26:41 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 12 Feb 2006 14:26:41 -0500
Subject: rpms/kyum/devel kyum.spec,1.8,1.9
Message-ID: <200602121927.k1CJRDVo024032@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	kyum.spec 
Log Message:

  Description:
    Preperation for mass rebuild for FC5.




Index: kyum.spec
===================================================================
RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kyum.spec	25 Jul 2005 15:18:36 -0000	1.8
+++ kyum.spec	12 Feb 2006 19:26:40 -0000	1.9
@@ -1,6 +1,6 @@
 Name:    kyum
 Version: 0.7.5
-Release: 1
+Release: 2%{?dist}
 
 Summary: Graphical User Frontend (GUI) for yum
 
@@ -67,6 +67,9 @@
 %doc ChangeLog COPYING README AUTHORS
 
 %changelog
+* Sun Feb 12 2006 Jochen Schmitt  0.7.5-2
+- Rebuilt for FC5
+
 * Mon Jul 25 2005 Jochen Schmitt  0.7.5-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Feb 12 19:29:03 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 12 Feb 2006 14:29:03 -0500
Subject: rpms/pdftk/devel pdftk.spec,1.3,1.4
Message-ID: <200602121929.k1CJTZfi024087@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	pdftk.spec 
Log Message:

  Description:
   Preperation for mass rebuild for FC5



Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pdftk.spec	15 Dec 2005 18:42:46 -0000	1.3
+++ pdftk.spec	12 Feb 2006 19:29:03 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
 Version: 	1.12
-Release: 	5
+Release: 	6%{?dist}
 License:	GPL
 URL: 		http://www.accesspdf.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Feb 12 2006 Jochen Schmitt  1.12-6
+- Rebuild for FC5
+
 * Thu Dec 15 2005 Jochen Schmitt  1.12-5
 - Rebuild
 - Remove strange '//SID' comment.



From fedora-extras-commits at redhat.com  Sun Feb 12 19:31:21 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 12 Feb 2006 14:31:21 -0500
Subject: rpms/stellarium/devel stellarium.spec,1.11,1.12
Message-ID: <200602121931.k1CJVrx6024139@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	stellarium.spec 
Log Message:

  Description:
    Preperation for FC5 mass rebuild.



Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stellarium.spec	10 Oct 2005 16:43:27 -0000	1.11
+++ stellarium.spec	12 Feb 2006 19:31:21 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -62,6 +62,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Feb 12 2006 Jochen Schmitt  0.7.1-3
+- Rebuilt for FC5
+
 * Mon Oct 10 2005 Jochen Schmitt  0.7.1-2
 - use of %%find_lang
 



From fedora-extras-commits at redhat.com  Sun Feb 12 19:33:38 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 12 Feb 2006 14:33:38 -0500
Subject: rpms/suck/devel suck.spec,1.7,1.8
Message-ID: <200602121934.k1CJYAwC024191@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	suck.spec 
Log Message:

  Description:
    Preperation for FC5 mass rebuild.



Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- suck.spec	24 Nov 2005 17:15:59 -0000	1.7
+++ suck.spec	12 Feb 2006 19:33:38 -0000	1.8
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -78,6 +78,9 @@
 %config(noreplace) /etc/sysconfig/suck/site
 
 %changelog
+* Sun Feb 12 2006 Jochen Schmitt  4.3.2-12
+- Rebuilt for FC5.
+
 * Thu Nov 24 2005 Jochen Schmit  4.3.2-11
 - Add %%{?dist} to release.
 



From fedora-extras-commits at redhat.com  Sun Feb 12 20:31:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Feb 2006 15:31:36 -0500
Subject: rpms/rpmlint/devel .cvsignore, 1.10, 1.11 rpmlint.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <200602122032.k1CKW8Gh026333@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore rpmlint.spec sources 
Log Message:
* Sun Feb 12 2006 Ville Skytt??  - 0.75-1
- 0.75.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Jan 2006 20:33:54 -0000	1.10
+++ .cvsignore	12 Feb 2006 20:31:35 -0000	1.11
@@ -1,2 +1 @@
-rpmlint-0.71.tar.bz2
-rpmlint-0.71-cvs20060115.patch.bz2
+rpmlint-0.75.tar.bz2


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmlint.spec	17 Jan 2006 20:33:54 -0000	1.19
+++ rpmlint.spec	12 Feb 2006 20:31:35 -0000	1.20
@@ -1,15 +1,15 @@
 Name:           rpmlint
-Version:        0.71
-Release:        3%{?dist}
+Version:        0.75
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
-Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
+#Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
+Source0:        http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
 Patch0:         %{name}-0.71-disttag.patch
-Patch1:         %{name}-0.71-cvs20060115.patch.bz2
 Patch2:         %{name}-0.71-prereq.patch
 Patch3:         %{name}-0.71-la-exec.patch
 Patch4:         %{name}-0.71-doc-exec.patch
@@ -31,7 +31,6 @@
 
 %prep
 %setup -q
-%patch1
 %patch0
 %patch2
 %patch3
@@ -88,6 +87,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Ville Skytt??  - 0.75-1
+- 0.75.
+
 * Tue Jan 17 2006 Ville Skytt??  - 0.71-3
 - Sync with upstream CVS as of 2006-01-15, includes improved versions of
   most of the earlier patches.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Jan 2006 20:33:54 -0000	1.10
+++ sources	12 Feb 2006 20:31:35 -0000	1.11
@@ -1,2 +1 @@
-9e7645ee79bfc75540c885f05dca0751  rpmlint-0.71.tar.bz2
-ed1fa7aaa6cbfcdf866b423adcd40cb2  rpmlint-0.71-cvs20060115.patch.bz2
+22a7657bb976ee2b1df851bc3976f70a  rpmlint-0.75.tar.bz2



From fedora-extras-commits at redhat.com  Sun Feb 12 20:35:26 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sun, 12 Feb 2006 15:35:26 -0500
Subject: rpms/fontforge/devel fontforge-20060125-glibccrash.patch, NONE,
	1.1 fontforge.spec, 1.15, 1.16
Message-ID: <200602122035.k1CKZwv4026383@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	fontforge.spec 
Added Files:
	fontforge-20060125-glibccrash.patch 
Log Message:
* Sun Feb 12 2006 Roozbeh Pournader  - 20060125-5
- Add patch to fix crash (#181052, George Williams)


fontforge-20060125-glibccrash.patch:

--- NEW FILE fontforge-20060125-glibccrash.patch ---
--- fontforge-20060125/fontforge/charview.c.glibccrash	2006-01-15 09:38:57.000000000 +0330
+++ fontforge-20060125/fontforge/charview.c	2006-02-12 23:49:58.000000000 +0330
@@ -2803,8 +2803,8 @@
 	    ss->first->prev->from->nextcpindex = pnum++;
 	for ( sp=ss->first; ; ) {
 	    if ( (sp->ttfindex==0xffff ||
-		    ( !sp->nonextcp && !sp->noprevcp &&
-		     !sp->roundx && !sp->roundy && !sp->dontinterpolate )) &&
+		    ( !sp->roundx && !sp->roundy && !sp->dontinterpolate )) &&
+		    !sp->nonextcp && !sp->noprevcp &&
 		    RealWithin((sp->nextcp.x+sp->prevcp.x)/2, sp->me.x,.1) &&
 		    RealWithin((sp->nextcp.y+sp->prevcp.y)/2, sp->me.y,.1) )
 		sp->ttfindex = 0xffff;


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fontforge.spec	1 Feb 2006 15:56:33 -0000	1.15
+++ fontforge.spec	12 Feb 2006 20:35:26 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           fontforge
 Version:        20060125
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -12,6 +12,7 @@
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tgz
+Patch1:         fontforge-20060125-glibccrash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .glibccrash
 
 mkdir htdocs
 tar xzf %{SOURCE2} -C htdocs
@@ -108,6 +110,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Roozbeh Pournader  - 20060125-5
+- Add patch to fix crash (#181052, George Williams)
+
 * Wed Feb 01 2006 Roozbeh Pournader  - 20060125-4
 - Add "BuildRequires:" on libXt-devel and xorg-x11-proto-devel
 



From fedora-extras-commits at redhat.com  Sun Feb 12 21:11:26 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun, 12 Feb 2006 16:11:26 -0500
Subject: rpms/libapreq2/devel .cvsignore, 1.7, 1.8 libapreq2.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200602122111.k1CLBxXK028396@cvs-int.fedora.redhat.com>

Author: bojan

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

Modified Files:
	.cvsignore libapreq2.spec sources 
Log Message:
Final 2.07 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Feb 2006 09:38:41 -0000	1.7
+++ .cvsignore	12 Feb 2006 21:11:26 -0000	1.8
@@ -1 +1 @@
-libapreq2-2.07-rc4.tar.gz
+libapreq2-2.07.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libapreq2.spec	3 Feb 2006 10:04:54 -0000	1.8
+++ libapreq2.spec	12 Feb 2006 21:11:26 -0000	1.9
@@ -2,14 +2,14 @@
 
 Name:           libapreq2
 Version:        2.07
-Release:        0.2.rc4%{?dist}
+Release:        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-rc4.tar.gz
+Source0:        http://people.apache.org/~joes/libapreq2-2.07.tar.gz
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-2.07-rc3-ldflags.patch
@@ -153,6 +153,9 @@
 
 
 %changelog
+* 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
 - re-tag for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Feb 2006 09:38:41 -0000	1.7
+++ sources	12 Feb 2006 21:11:26 -0000	1.8
@@ -1 +1 @@
-8fa0ef0e175f791fccd1681aa5eafc93  libapreq2-2.07-rc4.tar.gz
+6f2e5e4a14e8b190dead0fe91fc13080  libapreq2-2.07.tar.gz



From fedora-extras-commits at redhat.com  Sun Feb 12 21:26:41 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 12 Feb 2006 16:26:41 -0500
Subject: rpms/dejavu-fonts import.log,1.31,1.32
Message-ID: <200602122127.k1CLRERk028552@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28518

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-5.fs5 on branch devel from dejavu-fonts-2.2-5.fs5.src.rpm
push sfd build to rawhide to test result


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- import.log	12 Feb 2006 14:19:42 -0000	1.31
+++ import.log	12 Feb 2006 21:26:41 -0000	1.32
@@ -28,3 +28,4 @@
 dejavu-fonts-2_2-3_fc4:FC-4:dejavu-fonts-2.2-3.fc4.src.rpm:1137541581
 dejavu-fonts-2_2-3_fc3:FC-3:dejavu-fonts-2.2-3.fc3.src.rpm:1137541836
 dejavu-fonts-2_2-4_fc5:HEAD:dejavu-fonts-2.2-4.fc5.src.rpm:1139753973
+dejavu-fonts-2_2-5_fs5:HEAD:dejavu-fonts-2.2-5.fs5.src.rpm:1139779591



From fedora-extras-commits at redhat.com  Sun Feb 12 21:26:47 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 12 Feb 2006 16:26:47 -0500
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.11,1.12
Message-ID: <200602122127.k1CLRJvE028556@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28518/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-5.fs5 on branch devel from dejavu-fonts-2.2-5.fs5.src.rpm
push sfd build to rawhide to test result


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dejavu-fonts.spec	12 Feb 2006 14:19:49 -0000	1.11
+++ dejavu-fonts.spec	12 Feb 2006 21:26:47 -0000	1.12
@@ -7,15 +7,14 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
 Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# See bug #181052
-BuildRequires: fontforge >= 20060209
+BuildRequires: fontforge
 # The CPAN sources do not declare perl(Font::TTF)
 BuildRequires: perl-Font-TTF
 # Needed to compute unicode coverage
@@ -78,6 +77,9 @@
 %{fontdir}/*.ttf
 
 %changelog
+* Sun Feb 12 2006 Nicolas Mailhot  2.2-5
+- downgrade fontforge requirement following bug #181052 resolution
+
 * Sun Feb 12 2006 Nicolas Mailhot  2.2-4
 - WARNING: in an effort to get Fedora Extras as self-hosting as possible
   starting from this release ttf files are regenerated from sfd sources



From fedora-extras-commits at redhat.com  Sun Feb 12 21:29:05 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Feb 2006 16:29:05 -0500
Subject: rpms/gai/devel gai-0.5.10-xorg.patch,NONE,1.1 gai.spec,1.17,1.18
Message-ID: <200602122129.k1CLTbjn028675@cvs-int.fedora.redhat.com>

Author: salimma

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

Modified Files:
	gai.spec 
Added Files:
	gai-0.5.10-xorg.patch 
Log Message:
Updates to build against modular X in -devel


gai-0.5.10-xorg.patch:

--- NEW FILE gai-0.5.10-xorg.patch ---
--- gai-0.5.10.orig/configure	2005-06-26 02:01:36.000000000 -0500
+++ gai-0.5.10/configure	2006-01-30 20:26:40.000000000 -0500
@@ -3080,18 +3080,18 @@
 done
 
 
-if test "${ac_cv_header__usr_X11R6_include_X11_X_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for /usr/X11R6/include/X11/X.h" >&5
-echo $ECHO_N "checking for /usr/X11R6/include/X11/X.h... $ECHO_C" >&6
-if test "${ac_cv_header__usr_X11R6_include_X11_X_h+set}" = set; then
+if test "${ac_cv_header__usr_include_X11_X_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for /usr/include/X11/X.h" >&5
+echo $ECHO_N "checking for /usr/include/X11/X.h... $ECHO_C" >&6
+if test "${ac_cv_header__usr_include_X11_X_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header__usr_X11R6_include_X11_X_h" >&5
-echo "${ECHO_T}$ac_cv_header__usr_X11R6_include_X11_X_h" >&6
+echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_X11_X_h" >&5
+echo "${ECHO_T}$ac_cv_header__usr_include_X11_X_h" >&6
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking /usr/X11R6/include/X11/X.h usability" >&5
-echo $ECHO_N "checking /usr/X11R6/include/X11/X.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking /usr/include/X11/X.h usability" >&5
+echo $ECHO_N "checking /usr/include/X11/X.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3099,7 +3099,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include 
+#include 
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3135,15 +3135,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-echo "$as_me:$LINENO: checking /usr/X11R6/include/X11/X.h presence" >&5
-echo $ECHO_N "checking /usr/X11R6/include/X11/X.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking /usr/include/X11/X.h presence" >&5
+echo $ECHO_N "checking /usr/include/X11/X.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include 
+#include 
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3177,25 +3177,25 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: /usr/X11R6/include/X11/X.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: /usr/X11R6/include/X11/X.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /usr/include/X11/X.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: /usr/include/X11/X.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
 ## ------------------------------------------ ##
@@ -3206,18 +3206,18 @@
       sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for /usr/X11R6/include/X11/X.h" >&5
-echo $ECHO_N "checking for /usr/X11R6/include/X11/X.h... $ECHO_C" >&6
-if test "${ac_cv_header__usr_X11R6_include_X11_X_h+set}" = set; then
+echo "$as_me:$LINENO: checking for /usr/include/X11/X.h" >&5
+echo $ECHO_N "checking for /usr/include/X11/X.h... $ECHO_C" >&6
+if test "${ac_cv_header__usr_include_X11_X_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_header__usr_X11R6_include_X11_X_h=$ac_header_preproc
+  ac_cv_header__usr_include_X11_X_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header__usr_X11R6_include_X11_X_h" >&5
-echo "${ECHO_T}$ac_cv_header__usr_X11R6_include_X11_X_h" >&6
+echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_X11_X_h" >&5
+echo "${ECHO_T}$ac_cv_header__usr_include_X11_X_h" >&6
 
 fi
-if test $ac_cv_header__usr_X11R6_include_X11_X_h = yes; then
+if test $ac_cv_header__usr_include_X11_X_h = yes; then
   :
 else
 


Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gai.spec	16 Aug 2005 23:33:04 -0000	1.17
+++ gai.spec	12 Feb 2006 21:29:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.10
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Generic Applet Interface
 
 Group:		User Interface/Desktops
@@ -9,17 +9,18 @@
 Source0:	http://download.sf.net/gai/gai-%{version}.tar.bz2
 Patch0:		gai-0.5.9-pkgconfig.patch
 Patch1:		gai-0.5.10-nls.patch
+Patch2:		gai-0.5.10-xorg.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
-BuildRequires:	SDL-devel gtkglext-devel gettext
+BuildRequires:	libgnomeui-devel, gnome-panel-devel, mesa-libGLU-devel
+BuildRequires:	SDL-devel, gtkglext-devel, gettext, xorg-x11-proto-devel
 
 %package	devel
 Summary:	Library and headers for Generic Applet Interface
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig, pango-devel, gtk2-devel, gnome-panel-devel
-Requires:	libgnomeui-devel gtkglext-devel
+Requires:	pkgconfig, gnome-panel-devel, mesa-libGLU-devel
+Requires:	libgnomeui-devel, gtkglext-devel, xorg-x11-proto-devel
 
 %description
 This library provides a generic interface for developing applets for Gnome 2
@@ -38,6 +39,7 @@
 %setup -q
 %patch0 -p1 -b .pkgconfig
 %patch1 -p1 -b .nls
+%patch2 -p1 -b .xorg
 
 %build
 %ifarch x86_64
@@ -71,6 +73,10 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Mon Jan 30 2006 Michel Salim  - 0.5.10-5
+- regenerate configure to account for modular xorg's location change
+- BuildReq changes: removed implicit dependencies, added xorg-x11-proto-devel and mesa-libGLU-devel that are now no longer pulled in
+
 * Wed Aug 17 2005 Michael Schwendt  - 0.5.10-4
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Feb 12 21:29:27 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 12 Feb 2006 16:29:27 -0500
Subject: rpms/dejavu-fonts import.log,1.32,1.33
Message-ID: <200602122129.k1CLTxlu028678@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28658

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-5.fc5 on branch devel from dejavu-fonts-2.2-5.fc5.src.rpm
stupid tag typo


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- import.log	12 Feb 2006 21:26:41 -0000	1.32
+++ import.log	12 Feb 2006 21:29:27 -0000	1.33
@@ -29,3 +29,4 @@
 dejavu-fonts-2_2-3_fc3:FC-3:dejavu-fonts-2.2-3.fc3.src.rpm:1137541836
 dejavu-fonts-2_2-4_fc5:HEAD:dejavu-fonts-2.2-4.fc5.src.rpm:1139753973
 dejavu-fonts-2_2-5_fs5:HEAD:dejavu-fonts-2.2-5.fs5.src.rpm:1139779591
+dejavu-fonts-2_2-5_fc5:HEAD:dejavu-fonts-2.2-5.fc5.src.rpm:1139779757



From fedora-extras-commits at redhat.com  Sun Feb 12 21:37:09 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Feb 2006 16:37:09 -0500
Subject: rpms/gai-pal/devel gai-pal.spec,1.10,1.11
Message-ID: <200602122137.k1CLbf9E028770@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gai-pal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28751

Modified Files:
	gai-pal.spec 
Log Message:
Pre-rebuild commit: gai-pal needs (via gai-devel) gtkglext >= 1.1 if gtk2 2.8 is used 



Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gai-pal.spec	16 Aug 2005 23:33:05 -0000	1.10
+++ gai-pal.spec	12 Feb 2006 21:37:09 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:	GAI Pal applet
 Name:		gai-pal
 Version:	0.7
-Release:	7
+Release:	8
 Source0:	%{name}-%{version}.tar.bz2
 Patch0:		gai-pal-0.7-xosd-empty-msg.patch
 Patch1:		gai-pal-0.7-typo.patch
@@ -48,6 +48,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Feb 12 2005 Michel Salim  - 0.7-8
+- rebuild against new gtk2 and gtkglext
+
 * Wed Aug 17 2005 Michael Schwendt  - 0.7-7
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Feb 12 21:38:32 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Feb 2006 16:38:32 -0500
Subject: rpms/gai-pal/devel gai-pal.spec,1.11,1.12
Message-ID: <200602122139.k1CLd4RP028795@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gai-pal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28778

Modified Files:
	gai-pal.spec 
Log Message:
Fix changelog date typo



Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gai-pal.spec	12 Feb 2006 21:37:09 -0000	1.11
+++ gai-pal.spec	12 Feb 2006 21:38:32 -0000	1.12
@@ -48,7 +48,7 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Sun Feb 12 2005 Michel Salim  - 0.7-8
+* Sun Feb 12 2006 Michel Salim  - 0.7-8
 - rebuild against new gtk2 and gtkglext
 
 * Wed Aug 17 2005 Michael Schwendt  - 0.7-7



From fedora-extras-commits at redhat.com  Mon Feb 13 02:33:16 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun, 12 Feb 2006 21:33:16 -0500
Subject: rpms/libapreq2/FC-4 libapreq2-2.07-rc3-ldflags.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 libapreq2.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200602130233.k1D2XmZN007442@cvs-int.fedora.redhat.com>

Author: bojan

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

Modified Files:
	.cvsignore libapreq2.spec sources 
Added Files:
	libapreq2-2.07-rc3-ldflags.patch 
Log Message:
New stable release, version 2.07.


libapreq2-2.07-rc3-ldflags.patch:

--- NEW FILE libapreq2-2.07-rc3-ldflags.patch ---
--- apreq2-config.in~	2005-04-16 05:19:36.000000000 +0300
+++ apreq2-config.in	2005-12-08 22:27:47.000000000 +0200
@@ -173,8 +173,10 @@
     ;;
     --link-ld)
     if test "$location" = "installed"; then
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l$APREQ_LIBNAME"
+        if test "$libdir" != "/usr/lib"; then
+            flags="$flags -L$libdir"
+        fi
+        flags="$flags -l$APREQ_LIBNAME"
     else
         flags="$flags -L$thisdir/library/.libs -l$APREQ_LIBNAME"
     fi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2005 06:46:02 -0000	1.3
+++ .cvsignore	13 Feb 2006 02:33:15 -0000	1.4
@@ -1 +1 @@
-libapreq2-2.06-dev.tar.gz
+libapreq2-2.07.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-4/libapreq2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libapreq2.spec	5 Aug 2005 12:36:13 -0000	1.3
+++ libapreq2.spec	13 Feb 2006 02:33:15 -0000	1.4
@@ -1,16 +1,18 @@
 %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}}
 
 Name:           libapreq2
-Version:        2.06
-Release:        2%{?dist}
+Version:        2.07
+Release:        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}-dev.tar.gz
+#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
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
+Patch1:         %{name}-2.07-rc3-ldflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel >= 2.0.48
@@ -53,9 +55,22 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-dev
-aprver=$(apr-config --version)
-apuver=$(apu-config --version)
+%setup -q
+
+# Filter unversioned provides for which there's a versioned one in perl-*:
+cat << \EOF > %{name}-perl-prov
+#!/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}
+
+# Fix up paths in doc tag files:
+# ap*-1-config in FC5, ap*-config in earlier
+aprver=$(apr-1-config --version || apr-config --version)
+apuver=$(apu-1-config --version || apu-config --version)
 %{__perl} -pi -e \
   "s|.*?|%{_docdir}/%{name}-devel-%{version}/|" \
   docs/apreq2.tag
@@ -65,7 +80,11 @@
 %{__perl} -pi -e \
   "s|.*?|%{_docdir}/apr-util-devel-$apuver/html/|" \
   docs/apu.tag
+
 %patch0
+%patch1
+%{__perl} -pi -e 's|/usr/lib|%{_libdir}|' apreq2-config.in # patch1 ~ multilib
+
 ./buildconf
 
 
@@ -75,7 +94,7 @@
   --disable-static \
   --with-apache2-apxs=%{apxs} \
   --enable-perl-glue \
-  --with-perl-opts=INSTALLDIRS=vendor
+  --with-mm-opts=INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 
@@ -134,6 +153,28 @@
 
 
 %changelog
+* Mon Feb 13 2006 Bojan Smojver  - 2.07-1
+- bring in line with Rawhide (new stable release)
+
+* 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
+- bump up to 2.07-rc4
+
+* Sat Dec 10 2005 Ville Skytt??  - 2.07-0.2.rc3
+- Filter unversioned perl(*) provides for which a versioned one exists.
+
+* Thu Dec  8 2005 Ville Skytt??  - 2.07-0.1.rc3
+- Adapt to new apr, httpd.
+- Don't print -L for standard dirs in apreq2-config --link-ld output.
+
+* Sun Oct 16 2005 Ville Skytt??  - 2.07-0.rc3
+- 2.07-rc3.
+
+* Sat Oct 15 2005 Ville Skytt??  - 2.07-0.rc2
+- 2.07-rc2.
+
 * Fri Aug  5 2005 Ville Skytt??  - 2.06-2
 - Include *.tag files in -devel docs, thanks to Bojan Smojver.
 - Remove *.la instead of using %%exclude.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2005 06:46:02 -0000	1.3
+++ sources	13 Feb 2006 02:33:15 -0000	1.4
@@ -1 +1 @@
-e245db341c4967e0a23b7f767d6486d9  libapreq2-2.06-dev.tar.gz
+6f2e5e4a14e8b190dead0fe91fc13080  libapreq2-2.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 03:48:14 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 12 Feb 2006 22:48:14 -0500
Subject: rpms/soundconverter/devel .cvsignore, 1.3, 1.4 soundconverter.spec, 
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200602130348.k1D3mk2i010082@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2005 09:20:03 -0000	1.3
+++ .cvsignore	13 Feb 2006 03:48:14 -0000	1.4
@@ -1 +1 @@
-soundconverter-0.8.1.tar.gz
+soundconverter-0.8.3.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/soundconverter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- soundconverter.spec	16 Nov 2005 04:49:59 -0000	1.4
+++ soundconverter.spec	13 Feb 2006 03:48:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           soundconverter
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -11,7 +11,7 @@
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
-Requires:       pygtk2 gstreamer-python gstreamer-plugins gnome-python2-gconf
+Requires:       pygtk2 gstreamer08-python gstreamer08-plugins gnome-python2-gconf
 
 %description
 A simple sound converter application for the GNOME environment. It reads and
@@ -58,6 +58,10 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Feb 12 2006 Ignacio Vazquez-Abrams  0.8.3-1
+- Upstream update
+- Updated to use gstreamer08
+
 * Tue Nov 15 2005 Ignacio Vazquez-Abrams  0.8.1-2
 - Added gnome-python2-gconf to Requires (#173290)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2005 09:20:03 -0000	1.3
+++ sources	13 Feb 2006 03:48:14 -0000	1.4
@@ -1 +1 @@
-6bea010a5869d65e47d2506b2526087e  soundconverter-0.8.1.tar.gz
+ed02aa7fe34f9d3abe7d190b43232793  soundconverter-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 04:27:52 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 12 Feb 2006 23:27:52 -0500
Subject: rpms/dkms/devel dkms.spec,1.8,1.9
Message-ID: <200602130428.k1D4SPtE014241@cvs-int.fedora.redhat.com>

Author: mdomsch

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

Modified Files:
	dkms.spec 
Log Message:
rebuild for FC5


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dkms.spec	10 Dec 2005 15:54:10 -0000	1.8
+++ dkms.spec	13 Feb 2006 04:27:51 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
 Version: 2.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 BuildArch: noarch
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Matt Domsch  2.0.9-2
+- rebuild for FC5
+
 * Sat Dec 10 2005 Matt Domsch  2.0.9-1
 - Added URL tag
 - Update to 2.0.9



From fedora-extras-commits at redhat.com  Mon Feb 13 04:29:54 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 12 Feb 2006 23:29:54 -0500
Subject: rpms/gpp/devel gpp.spec,1.1,1.2
Message-ID: <200602130430.k1D4UQNl014303@cvs-int.fedora.redhat.com>

Author: mdomsch

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

Modified Files:
	gpp.spec 
Log Message:
rebuild for FC5


Index: gpp.spec
===================================================================
RCS file: /cvs/extras/rpms/gpp/devel/gpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpp.spec	10 Nov 2005 19:11:48 -0000	1.1
+++ gpp.spec	13 Feb 2006 04:29:54 -0000	1.2
@@ -3,7 +3,7 @@
 Summary:	GNOME Photo Printer
 Name:           gpp
 Version:	0.6.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.fogman.de/?GnomePhotoPrinter
 Source:         http://www.fogman.de/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{longname}.desktop
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Matt Domsch  0.6.5-3
+- rebuild for FC5
+
 * Sun Sep 11 2005 Matt Domsch  0.6.5-2
 - cleanups based on Fedora Extras review
 



From fedora-extras-commits at redhat.com  Mon Feb 13 04:36:18 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 12 Feb 2006 23:36:18 -0500
Subject: rpms/ttywatch/devel ttywatch.spec,1.1,1.2
Message-ID: <200602130436.k1D4aoZ5014375@cvs-int.fedora.redhat.com>

Author: mdomsch

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

Modified Files:
	ttywatch.spec 
Log Message:
rebuild for FC5


Index: ttywatch.spec
===================================================================
RCS file: /cvs/extras/rpms/ttywatch/devel/ttywatch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ttywatch.spec	29 Nov 2005 15:44:34 -0000	1.1
+++ ttywatch.spec	13 Feb 2006 04:36:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name: ttywatch
 Version: 0.14
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Log output of arbitrarily many devices
 License: GPL
 Group: System Environment/Daemons
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Matt Domsch  0.14-5
+- rebuild for FC5
+
 * Tue Nov 29 2005 Matt Domsch  0.14-4
 - -devel requires glib2-devel
 - require /sbin/{chkconfig,service} rather than initscripts



From fedora-extras-commits at redhat.com  Mon Feb 13 04:51:11 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 12 Feb 2006 23:51:11 -0500
Subject: rpms/pgp-tools/devel pgp-tools.spec,1.1,1.2
Message-ID: <200602130451.k1D4phkK014446@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14426

Modified Files:
	pgp-tools.spec 
Log Message:
upgrade to latest upstream, rebuild for FC5


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/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	13 Feb 2006 04:51:11 -0000	1.2
@@ -1,4 +1,4 @@
-%define alphatag 20051123svn
+%define alphatag 20060212svn
 Name:           pgp-tools
 Version:        0.4.4
 Release:        3.%{alphatag}%{?dist}
@@ -68,6 +68,10 @@
 
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Mon Feb 13 04:51:50 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 12 Feb 2006 23:51:50 -0500
Subject: rpms/pgp-tools/devel sources,1.2,1.3 .cvsignore,1.2,1.3
Message-ID: <200602130452.k1D4qN79014471@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14452

Modified Files:
	sources .cvsignore 
Log Message:
upgrade to latest upstream, rebuild for FC5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/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	13 Feb 2006 04:51:50 -0000	1.3
@@ -1 +1 @@
-0c92a17af63242b52c63ad46b2091e2a  pgp-tools-0.4.4-20051123svn.tar.bz2
+e77dc370a32731cd60d0ceb47218db96  pgp-tools-0.4.4-20060212svn.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/.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	13 Feb 2006 04:51:50 -0000	1.3
@@ -1 +1 @@
-pgp-tools-0.4.4-20051123svn.tar.bz2
+pgp-tools-0.4.4-20060212svn.tar.bz2



From fedora-extras-commits at redhat.com  Mon Feb 13 04:58:15 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 12 Feb 2006 23:58:15 -0500
Subject: rpms/i810switch/devel i810switch.spec,1.5,1.6
Message-ID: <200602130458.k1D4wms6014631@cvs-int.fedora.redhat.com>

Author: mdomsch

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

Modified Files:
	i810switch.spec 
Log Message:
rebuild for FC5


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- i810switch.spec	17 Jan 2006 21:19:41 -0000	1.5
+++ i810switch.spec	13 Feb 2006 04:58:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
@@ -37,6 +37,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Feb 12 2006 Matt Domsch  - 0.6.5-2
+- rebuild for FC5
+
 * Tue Jan 17 2006 Matt Domsch  - 0.6.5-1
 - update to 0.6.5, change URLs due to new upstream maintainer
 



From fedora-extras-commits at redhat.com  Mon Feb 13 05:53:43 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 13 Feb 2006 00:53:43 -0500
Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.2,1.3
Message-ID: <200602130554.k1D5sGtM016666@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim-fcitx.spec 
Log Message:
- build conditionally with libstdc++so7 preview library (#166041)
  - add with_libstdc_preview switch and tweak libtool to link against it
- update filelist since moduledir is now api-versioned



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-fcitx.spec	27 Dec 2005 03:16:11 -0000	1.2
+++ scim-fcitx.spec	13 Feb 2006 05:53:43 -0000	1.3
@@ -1,6 +1,8 @@
+%define with_libstdc_preview 1 
+
 Name:           scim-fcitx
 Version:        3.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
@@ -10,6 +12,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  scim-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
 Requires:	scim
 
 %description
@@ -30,16 +35,26 @@
 
 
 %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
 # doesn't build with %{?_smp_mflags}
 make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%if %{with_libstdc_preview}
+export CXX=%{_bindir}/g++-libstdc++-so_7
+%endif
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/IMEngine/fcitx.la
+rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/*/IMEngine/fcitx.la
 
 
 %clean
@@ -49,7 +64,7 @@
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING README ChangeLog
-%{_libdir}/scim-1.0/IMEngine/fcitx.so
+%{_libdir}/scim-1.0/*/IMEngine/fcitx.so
 %{_datadir}/scim/fcitx
 %{_datadir}/scim/icons/fcitx
 
@@ -60,6 +75,11 @@
 
 
 %changelog
+* Mon Feb 13 2006 Jens Petersen  - 3.1.1-3
+- build conditionally with libstdc++so7 preview library (#166041)
+  - add with_libstdc_preview switch and tweak libtool to link against it
+- update filelist since moduledir is now api-versioned
+
 * Tue Dec 20 2005 Jens Petersen  - 3.1.1-2
 - package cleanup (John Mahowald)
 



From fedora-extras-commits at redhat.com  Mon Feb 13 06:21:12 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 13 Feb 2006 01:21:12 -0500
Subject: rpms/scim-input-pad/devel scim-input-pad.spec,1.4,1.5
Message-ID: <200602130621.k1D6LiXP018607@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim-input-pad.spec 
Log Message:
- build conditionally with libstdc++so7 preview library (#166041)
  - add with_libstdc_preview switch and tweak libtool to link against it
- update filelist since moduledir is now api-versioned



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scim-input-pad.spec	12 Feb 2006 00:13:51 -0000	1.4
+++ scim-input-pad.spec	13 Feb 2006 06:21:12 -0000	1.5
@@ -1,6 +1,8 @@
+%define with_libstdc_preview 1 
+
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -12,6 +14,9 @@
 Patch0:         scim-input-pad-rpath.patch
 
 BuildRequires:  scim-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
 Requires:       scim
 
 %description
@@ -23,16 +28,26 @@
 
 
 %build
+%if %{with_libstdc_preview}
+export CXX=%{_bindir}/g++-libstdc++-so_7
+%endif
 %configure --disable-static --disable-rpath
+%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 DESTDIR=${RPM_BUILD_ROOT} install
 
-rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
-rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
+rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/Helper/input-pad.la
+rm ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
 
 %find_lang %{name}
 
@@ -52,13 +67,17 @@
 %doc COPYING README ChangeLog
 %{_bindir}/scim-input-pad
 %{_libdir}/libscim-input-pad.so.*
-%{_libdir}/scim-1.0/Helper/input-pad.so
+%{_libdir}/scim-1.0/*/Helper/input-pad.so
 %{_datadir}/scim/icons/input-pad.png
-%dir %{_datadir}/scim/input-pad/
-%{_datadir}/scim/input-pad/*
+%{_datadir}/scim/input-pad
 
 
 %changelog
+* 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
+- update filelist since moduledir is now api-versioned
+
 * Sun Feb 12 2006 Ryo Dairiki  - 0.1.1-2
 - a little cleanup
 



From fedora-extras-commits at redhat.com  Mon Feb 13 06:31:15 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 13 Feb 2006 01:31:15 -0500
Subject: rpms/scim-skk/devel scim-skk.spec,1.10,1.11
Message-ID: <200602130631.k1D6VlRw018700@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim-skk.spec 
Log Message:
- build conditionally with libstdc++so7 preview library (#166041)
  - add with_libstdc_preview switch and tweak libtool to link against it
- update filelist since moduledir is now api-versioned



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scim-skk.spec	12 Feb 2006 01:03:16 -0000	1.10
+++ scim-skk.spec	13 Feb 2006 06:31:14 -0000	1.11
@@ -1,6 +1,8 @@
-Name:	    scim-skk
+%define with_libstdc_preview 1 
+
+Name:		scim-skk
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
@@ -9,8 +11,11 @@
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:		scim skkdic
 BuildRequires:	scim-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
+Requires:	scim, skkdic
 
 %description
 Scim-skk is a SCIM IMEngine module for skk to support Japanese input
@@ -21,15 +26,25 @@
 
 
 %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 DESTDIR=${RPM_BUILD_ROOT} install
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la
 
 %find_lang %{name}
 
@@ -41,15 +56,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
-%dir %{_libdir}/scim-1.0/IMEngine
-%{_libdir}/scim-1.0/IMEngine/skk.so
-%dir %{_libdir}/scim-1.0/SetupUI
-%{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
-%{_datadir}/scim/icons/scim-skk.png
+%{_libdir}/scim-1.0/*/IMEngine/skk.so
+%{_libdir}/scim-1.0/*/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
+* 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
+- update filelist since moduledir is now api-versioned
+
+
 * Sun Feb 12 2006 Ryo Dairiki  - 0.5.2-2
 - a little cleanup
 



From fedora-extras-commits at redhat.com  Mon Feb 13 06:42:32 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 13 Feb 2006 01:42:32 -0500
Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.2,1.3
Message-ID: <200602130643.k1D6h5Tw018820@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim-tomoe.spec 
Log Message:
- build conditionally with libstdc++so7 preview library (#166041)
  - add with_libstdc_preview switch and tweak libtool to link against it
- list shared object module files explicitly



Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-tomoe.spec	7 Oct 2005 09:54:16 -0000	1.2
+++ scim-tomoe.spec	13 Feb 2006 06:42:32 -0000	1.3
@@ -1,6 +1,8 @@
+%define with_libstdc_preview 1 
+
 Name:           scim-tomoe
 Version:        0.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -9,8 +11,11 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:		scim
-BuildRequires:	scim-devel, tomoe-devel
+BuildRequires:  scim-devel, tomoe-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
+Requires:       scim
 
 %description
 Scim-tomoe allows Japanese handwritten input of characters using SCIM.
@@ -21,15 +26,25 @@
 
 
 %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
 
-rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la
 
 %find_lang %{name}
 
@@ -41,16 +56,22 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog
-%{_libdir}/scim-1.0
+%{_libdir}/scim-1.0/*/Helper/tomoe.so
+%{_libdir}/scim-1.0/*/SetupUI/tomoe-setup.so
 %{_datadir}/scim/icons/scim-tomoe.png
 
 
 %changelog
-* Fri Oct  7 2005 Ryo Dairiki  - 0.1-2
+* Mon Feb 13 2006 Jens Petersen  - 0.1.0-3
+- build conditionally with libstdc++so7 preview library (#166041)
+  - add with_libstdc_preview switch and tweak libtool to link against it
+- list shared object module files explicitly
+
+* Fri Oct  7 2005 Ryo Dairiki  - 0.1.0-2
 - add scim into the requirement
 
-* Wed Aug 31 2005 Ryo Dairiki  - 0.1-1
-- update to 0.1
+* Wed Aug 31 2005 Ryo Dairiki  - 0.1.0-1
+- update to 0.1.0
 
 * Wed Aug 17 2005 Jens Petersen  - 0.0.0-0.20050817
 - initial packaging of cvs snapshot



From fedora-extras-commits at redhat.com  Mon Feb 13 07:20:43 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 13 Feb 2006 02:20:43 -0500
Subject: rpms/python-amara/devel python-amara-1.1.7-version.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 python-amara.spec, 1.10, 1.11 sources,
	1.3, 1.4
Message-ID: <200602130721.k1D7LF9j020899@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore python-amara.spec sources 
Added Files:
	python-amara-1.1.7-version.patch 
Log Message:
Upstream update

python-amara-1.1.7-version.patch:

--- NEW FILE python-amara-1.1.7-version.patch ---
--- Amara-1.1.7/setup.py.version	2006-02-13 01:46:54.000000000 -0500
+++ Amara-1.1.7/setup.py	2006-02-13 01:47:08.000000000 -0500
@@ -1,6 +1,6 @@
 #!/bin/env python
 from distutils import core
-from lib import __version__
+__version__ = '1.1.7'
 
 #Metadata
 kw = {'name': "Amara",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Apr 2005 04:58:52 -0000	1.3
+++ .cvsignore	13 Feb 2006 07:20:43 -0000	1.4
@@ -1 +1 @@
-Amara-1.0b1.tar.bz2
+Amara-1.1.7.tar.bz2


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/python-amara.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-amara.spec	23 Dec 2005 06:44:47 -0000	1.10
+++ python-amara.spec	13 Feb 2006 07:20:43 -0000	1.11
@@ -2,18 +2,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-amara
-Version:        1.0
-Release:        1.b1%{?dist}
+Version:        1.1.7
+Release:        1%{?dist}
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
 License:        ASL-derived
 URL:            http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/
-Source0:        http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/Amara-1.0b1.tar.bz2
+Source0:        http://uche.ogbuji.net/tech/4Suite/etc/Amara-%{version}.tar.bz2
+Patch:          python-amara-1.1.7-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python
-Requires:       python-abi = %{pyver} 4Suite >= 1.0
+# Needs python-4Suite-XML >= 1.0b2
+BuildRequires:  python python-4Suite-XML
+Requires:       python-abi = %{pyver} python-4Suite-XML
 BuildArch:      noarch
 
 %description
@@ -27,7 +29,8 @@
 to these capabilities.
 
 %prep
-%setup -q -n Amara-1.0b1
+%setup -q -n Amara-%{version}
+%patch -p 1 -b .version
 
 %build
 %{__python} setup.py build
@@ -49,6 +52,9 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.1.7-1
+- Upstream update
+
 * Wed Apr 20 2005 Ignacio Vazquez-Abrams  1.0-1.b1
 - Upstream update
 - Fixed file ownership


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Apr 2005 04:58:52 -0000	1.3
+++ sources	13 Feb 2006 07:20:43 -0000	1.4
@@ -1 +1 @@
-455656d787bc67eb2301aeee93797bd9  Amara-1.0b1.tar.bz2
+12ae537e9c517a258194878e65c85672  Amara-1.1.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Feb 13 07:35:30 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 02:35:30 -0500
Subject: rpms/fuse/devel fuse.spec,1.5,1.6
Message-ID: <200602130736.k1D7a25m021037@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	fuse.spec 
Log Message:

Version 2.5.2-2



Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fuse.spec	7 Feb 2006 20:52:31 -0000	1.5
+++ fuse.spec	13 Feb 2006 07:35:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -43,6 +43,7 @@
 Summary:        File System in Userspace (FUSE) devel files
 Group:          Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires: 	pkgconfig
 License:        LGPL
 
 %description devel
@@ -117,6 +118,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Mon Feb 13 2006 Peter Lemenkov  - 2.5.2-2
+- Added missing requires
+
 * Tue Feb 07 2006 Peter Lemenkov  - 2.5.2-1
 - Update to 2.5.2
 - Dropped fuse-mount.fuse.patch



From fedora-extras-commits at redhat.com  Mon Feb 13 08:52:54 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 13 Feb 2006 03:52:54 -0500
Subject: fedora-security/audit fc4,1.151,1.152 fc5,1.60,1.61
Message-ID: <200602130852.k1D8qsOD023124@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
Updates from Friday and weekend



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- fc4	10 Feb 2006 20:23:22 -0000	1.151
+++ fc4	13 Feb 2006 08:52:46 -0000	1.152
@@ -1,9 +1,9 @@
-Up to date CVE as of CVE email 20060207
-Up to date FC4 as of 20060207
+Up to date CVE as of CVE email 20060212
+Up to date FC4 as of 20060212
 
 ** are items that need attention
 
-CVE-2006-0645 VULNERABLE (gnutls)
+CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107]
 CVE-2006-0591 VULNERABLE (postgresql)
 CVE-2006-0576 VULNERABLE (oprofile)
 CVE-2006-0528 **evolution
@@ -15,9 +15,9 @@
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected
-CVE-2006-0301 VULNERABLE (xpdf) bz#179047
-CVE-2006-0301 VULNERABLE (poppler) bz#179054
-CVE-2006-0301 VULNERABLE (kdegraphics) bz#179056
+CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104]
+CVE-2006-0301 version (poppler, fixed 0.4.5) [since FEDORA-2006-103]
+CVE-2006-0301 backport (kdegraphics) [since FEDORA-2006-105]
 CVE-2006-0299 version (firefox, 1.5 only)
 CVE-2006-0299 version (mozilla, 1.8 branch only)
 CVE-2006-0299 version (thunderbird, 1.5 only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- fc5	10 Feb 2006 20:23:22 -0000	1.60
+++ fc5	13 Feb 2006 08:52:46 -0000	1.61
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20060206
+Up to date CVE as of CVE email 20060212
 Up to date FC5 as of FC5-Test2-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -28,7 +28,7 @@
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724:rawhide
 CVE-2006-0301 VULNERABLE (xpdf) bz#179423:rawhide
-CVE-2006-0301 VULNERABLE (poppler) bz#179424
+CVE-2006-0301 VULNERABLE (poppler, fixed 0.4.5) bz#179424
 CVE-2006-0301 VULNERABLE (kdegraphics) bz#179425:rawhide
 CVE-2006-0299 VULNERABLE (firefox, fixed 1.5.0.1)
 CVE-2006-0299 version (mozilla, 1.8 branch only)



From fedora-extras-commits at redhat.com  Mon Feb 13 10:16:46 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 13 Feb 2006 05:16:46 -0500
Subject: rpms/recode/devel recode.spec,1.6,1.7
Message-ID: <200602131017.k1DAHI7J027561@cvs-int.fedora.redhat.com>

Author: zkota

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

Modified Files:
	recode.spec 
Log Message:
Rebuild for FC5



Index: recode.spec
===================================================================
RCS file: /cvs/extras/rpms/recode/devel/recode.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- recode.spec	22 Dec 2005 11:25:36 -0000	1.6
+++ recode.spec	13 Feb 2006 10:16:45 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Conversion between character sets and surfaces
 Name: recode
 Version: 3.6
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPL
 Group: Applications/File
 Source: http://recode.progiciels-bpi.ca/archives/recode-%{version}.tar.gz
@@ -87,6 +87,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Feb 13 2006 Zoltan Kota  3.6-21
+- rebuild
+
 * Thu Dec 22 2005 Zoltan Kota  3.6-20
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 10:53:25 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 13 Feb 2006 05:53:25 -0500
Subject: rpms/python-bibtex/devel python-bibtex.spec,1.9,1.10
Message-ID: <200602131053.k1DArvRj027790@cvs-int.fedora.redhat.com>

Author: zkota

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

Modified Files:
	python-bibtex.spec 
Log Message:
Rebuild for FC5



Index: python-bibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/python-bibtex/devel/python-bibtex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-bibtex.spec	22 Dec 2005 11:48:06 -0000	1.9
+++ python-bibtex.spec	13 Feb 2006 10:53:25 -0000	1.10
@@ -5,7 +5,7 @@
 Summary: Python extension to parse BibTeX files
 Name: python-bibtex
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Libraries
 Source: http://dl.sf.net/pybliographer/python-bibtex-1.2.2.tar.gz
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Zoltan Kota  - 1.2.2-3
+- rebuild
+
 * Thu Dec 22 2005 Zoltan Kota  - 1.2.2-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 11:10:40 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 06:10:40 -0500
Subject: rpms/fuse/devel fuse-udev_rules.patch,1.3,1.4 fuse.spec,1.6,1.7
Message-ID: <200602131111.k1DBBF1K029669@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:

Correct udev rules


fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse-udev_rules.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-udev_rules.patch	15 Jan 2006 10:16:27 -0000	1.3
+++ fuse-udev_rules.patch	13 Feb 2006 11:10:30 -0000	1.4
@@ -1,5 +1,26 @@
-diff -u util.org/udev.rules util/udev.rules
---- util.org/udev.rules	2005-11-03 19:38:05.000000000 +0100
+--- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
++++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
+@@ -24,7 +24,7 @@
+ 
+ install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
+-	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
++	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+--- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
++++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
+@@ -465,7 +465,7 @@
+ 
+ install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
+-	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
++	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+--- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse.spec	13 Feb 2006 07:35:30 -0000	1.6
+++ fuse.spec	13 Feb 2006 11:10:34 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -11,8 +11,7 @@
 Source2:	fuse-makedev.d-fuse
 Source3:	fuse-README.fedora
 
-#Patch0:		fuse-mount.fuse.patch
-Patch1:		fuse-udev_rules.patch
+Patch0:		fuse-udev_rules.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	kernel >= 2.6.14
 Requires(pre):	  %{_sbindir}/groupadd
@@ -56,8 +55,7 @@
 %setup -q
 #disable device creation during build/install
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
-#%patch0 -b .patch0
-%patch1 -b .patch1
+%patch0 -b .patch0
 cp %{SOURCE3} README.fedora
 
 %build
@@ -71,7 +69,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -103,8 +101,8 @@
 /sbin/mount.fuse
 %attr(4754,root,fuse) %{_bindir}/fusermount
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/40-fuse.rules
-%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+%{_sysconfdir}/udev/rules.d/60-fuse.rules
+%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
@@ -118,6 +116,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Mon Feb 13 2006 Peter Lemenkov  - 2.5.2-3
+- Proper udev rule
+
 * Mon Feb 13 2006 Peter Lemenkov  - 2.5.2-2
 - Added missing requires
 



From fedora-extras-commits at redhat.com  Mon Feb 13 11:12:31 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 13 Feb 2006 06:12:31 -0500
Subject: rpms/pybliographer/devel pybliographer.spec,1.12,1.13
Message-ID: <200602131113.k1DBD3NV029733@cvs-int.fedora.redhat.com>

Author: zkota

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

Modified Files:
	pybliographer.spec 
Log Message:
Rebuild for FC5



Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pybliographer.spec	23 Jan 2006 21:41:50 -0000	1.12
+++ pybliographer.spec	13 Feb 2006 11:12:17 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.8.tar.gz
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Zoltan Kota  - 1.2.8-2
+- rebuild
+
 * Mon Jan 23 2006 Zoltan Kota  - 1.2.8-1
 - update to 1.2.8
 - drop patches, fixed upstream



From fedora-extras-commits at redhat.com  Mon Feb 13 11:23:39 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 06:23:39 -0500
Subject: rpms/fuse-sshfs/devel fuse-sshfs.spec,1.2,1.3
Message-ID: <200602131124.k1DBOCOi029844@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29827

Modified Files:
	fuse-sshfs.spec 
Log Message:

Version 1.4-1




Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fuse-sshfs.spec	23 Nov 2005 19:39:08 -0000	1.2
+++ fuse-sshfs.spec	13 Feb 2006 11:23:39 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           fuse-sshfs
-Version:        1.2
-Release:        3%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
 License:        GPL
 URL:            http://fuse.sourceforge.net/sshfs.html
-Source0:        http://dl.sourceforge.net/sourceforge/fuse/sshfs-fuse-1.2.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/fuse/sshfs-fuse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fuse >= 2.2
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Peter Lemenkov  - 1.4-1
+- Version 1.4
+
 * Wed Nov 23 2005 Thorsten Leemhuis  - 1.2-3
 - Use dist
 



From fedora-extras-commits at redhat.com  Mon Feb 13 11:26:48 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 06:26:48 -0500
Subject: rpms/fuse-sshfs import.log,1.2,1.3
Message-ID: <200602131127.k1DBRK75029957@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29924

Modified Files:
	import.log 
Log Message:
auto-import fuse-sshfs-1.4-1 on branch devel from fuse-sshfs-1.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Nov 2005 19:36:31 -0000	1.2
+++ import.log	13 Feb 2006 11:26:48 -0000	1.3
@@ -1 +1,2 @@
 fuse-sshfs-1_2-2:HEAD:fuse-sshfs-1.2-2.src.rpm:1132774589
+fuse-sshfs-1_4-1:HEAD:fuse-sshfs-1.4-1.src.rpm:1139829998



From fedora-extras-commits at redhat.com  Mon Feb 13 11:26:54 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 06:26:54 -0500
Subject: rpms/fuse-sshfs/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200602131127.k1DBRQqE029961@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29924/devel

Modified Files:
	.cvsignore sources 
Log Message:
auto-import fuse-sshfs-1.4-1 on branch devel from fuse-sshfs-1.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Nov 2005 19:36:36 -0000	1.2
+++ .cvsignore	13 Feb 2006 11:26:54 -0000	1.3
@@ -1 +1 @@
-sshfs-fuse-1.2.tar.gz
+sshfs-fuse-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Nov 2005 19:36:36 -0000	1.2
+++ sources	13 Feb 2006 11:26:54 -0000	1.3
@@ -1 +1 @@
-685dc6611e20242602105fe4960a6ab9  sshfs-fuse-1.2.tar.gz
+3777dd6f232d33c9110abfa5ecd5518e  sshfs-fuse-1.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 11:30:30 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 13 Feb 2006 06:30:30 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.11, 1.12 abcm2ps.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200602131131.k1DBV3SU030041@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Jan 2006 20:11:20 -0000	1.11
+++ .cvsignore	13 Feb 2006 11:30:30 -0000	1.12
@@ -1,2 +1,2 @@
-abcm2ps-4.12.6.tar.gz
+abcm2ps-4.12.8.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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abcm2ps.spec	30 Jan 2006 20:11:20 -0000	1.11
+++ abcm2ps.spec	13 Feb 2006 11:30:30 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.6
-Release:        2%{?dist}
+Version:        4.12.8
+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.6.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.8.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
+* Mon Feb 13 2006 Gerard Milmeister  - 4.12.8-1
+- new version 4.12.8
+
 * Mon Jan 30 2006 Gerard Milmeister  - 4.12.6-1
 - new version 4.12.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Jan 2006 20:11:20 -0000	1.11
+++ sources	13 Feb 2006 11:30:30 -0000	1.12
@@ -1,2 +1,2 @@
-aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
+119acfaf7c93ea0a83a69d4c6ae5c9ac  abcm2ps-4.12.8.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Feb 13 11:37:35 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 13 Feb 2006 06:37:35 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.11, 1.12 abcm2ps.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200602131138.k1DBc8Wi030127@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Jan 2006 20:11:02 -0000	1.11
+++ .cvsignore	13 Feb 2006 11:37:35 -0000	1.12
@@ -1,2 +1,2 @@
-abcm2ps-4.12.6.tar.gz
+abcm2ps-4.12.8.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abcm2ps.spec	30 Jan 2006 20:11:02 -0000	1.11
+++ abcm2ps.spec	13 Feb 2006 11:37:35 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.6
-Release:        2%{?dist}
+Version:        4.12.8
+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.6.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.8.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
+* Mon Feb 13 2006 Gerard Milmeister  - 4.12.8-1
+- new version 4.12.8
+
 * Mon Jan 30 2006 Gerard Milmeister  - 4.12.6-1
 - new version 4.12.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Jan 2006 20:11:02 -0000	1.11
+++ sources	13 Feb 2006 11:37:35 -0000	1.12
@@ -1,2 +1,2 @@
-aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
+119acfaf7c93ea0a83a69d4c6ae5c9ac  abcm2ps-4.12.8.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Feb 13 11:37:41 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 13 Feb 2006 06:37:41 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.11, 1.12 abcm2ps.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200602131138.k1DBcDnX030132@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Jan 2006 20:11:41 -0000	1.11
+++ .cvsignore	13 Feb 2006 11:37:41 -0000	1.12
@@ -1,2 +1,2 @@
-abcm2ps-4.12.6.tar.gz
+abcm2ps-4.12.8.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abcm2ps.spec	30 Jan 2006 20:11:41 -0000	1.11
+++ abcm2ps.spec	13 Feb 2006 11:37:41 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.6
-Release:        2%{?dist}
+Version:        4.12.8
+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.6.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.8.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
+* Mon Feb 13 2006 Gerard Milmeister  - 4.12.8-1
+- new version 4.12.8
+
 * Mon Jan 30 2006 Gerard Milmeister  - 4.12.6-1
 - new version 4.12.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Jan 2006 20:11:41 -0000	1.11
+++ sources	13 Feb 2006 11:37:41 -0000	1.12
@@ -1,2 +1,2 @@
-aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
+119acfaf7c93ea0a83a69d4c6ae5c9ac  abcm2ps-4.12.8.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Feb 13 12:06:08 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 07:06:08 -0500
Subject: rpms/fuse-sshfs/FC-4 fuse-sshfs.spec,1.2,1.3
Message-ID: <200602131206.k1DC6eur032717@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32700

Modified Files:
	fuse-sshfs.spec 
Log Message:

Upgrade to 1.4




Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/fuse-sshfs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fuse-sshfs.spec	23 Nov 2005 19:39:08 -0000	1.2
+++ fuse-sshfs.spec	13 Feb 2006 12:06:08 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           fuse-sshfs
-Version:        1.2
-Release:        3%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
 License:        GPL
 URL:            http://fuse.sourceforge.net/sshfs.html
-Source0:        http://dl.sourceforge.net/sourceforge/fuse/sshfs-fuse-1.2.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/fuse/sshfs-fuse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fuse >= 2.2
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Peter Lemenkov  - 1.4-1
+- Version 1.4
+
 * Wed Nov 23 2005 Thorsten Leemhuis  - 1.2-3
 - Use dist
 



From fedora-extras-commits at redhat.com  Mon Feb 13 12:14:50 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 07:14:50 -0500
Subject: rpms/fuse-sshfs/FC-4 .cvsignore, 1.2, 1.3 fuse-sshfs.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200602131215.k1DCFMBN000342@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv319

Modified Files:
	.cvsignore fuse-sshfs.spec sources 
Log Message:

small fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Nov 2005 19:36:36 -0000	1.2
+++ .cvsignore	13 Feb 2006 12:14:49 -0000	1.3
@@ -1 +1 @@
-sshfs-fuse-1.2.tar.gz
+sshfs-fuse-1.4.tar.gz


Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/fuse-sshfs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-sshfs.spec	13 Feb 2006 12:06:08 -0000	1.3
+++ fuse-sshfs.spec	13 Feb 2006 12:14:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           fuse-sshfs
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
@@ -19,32 +19,29 @@
 up: i.e. on the server side there's nothing to do.  On the client side 
 mounting the filesystem is as easy as logging into the server with ssh.
 
-
 %prep
 %setup -q -n sshfs-fuse-%{version}
 
-
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/sshfs
 
-
 %changelog
+* Mon Feb 13 2006 Peter Lemenkov  - 1.4-2
+- small cosmetic fixes
+
 * Mon Feb 13 2006 Peter Lemenkov  - 1.4-1
 - Version 1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Nov 2005 19:36:36 -0000	1.2
+++ sources	13 Feb 2006 12:14:49 -0000	1.3
@@ -1 +1 @@
-685dc6611e20242602105fe4960a6ab9  sshfs-fuse-1.2.tar.gz
+3777dd6f232d33c9110abfa5ecd5518e  sshfs-fuse-1.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 12:16:18 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 07:16:18 -0500
Subject: rpms/fuse-sshfs/devel fuse-sshfs.spec,1.3,1.4
Message-ID: <200602131216.k1DCGpK0000432@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-sshfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv393

Modified Files:
	fuse-sshfs.spec 
Log Message:

Small cosmetic fixes




Index: fuse-sshfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-sshfs.spec	13 Feb 2006 11:23:39 -0000	1.3
+++ fuse-sshfs.spec	13 Feb 2006 12:16:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           fuse-sshfs
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FUSE-Filesystem to access remote filesystems via SSH
 
 Group:          System Environment/Base
@@ -19,32 +19,29 @@
 up: i.e. on the server side there's nothing to do.  On the client side 
 mounting the filesystem is as easy as logging into the server with ssh.
 
-
 %prep
 %setup -q -n sshfs-fuse-%{version}
 
-
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/sshfs
 
-
 %changelog
+* Mon Feb 13 2006 Peter Lemenkov  - 1.4-2
+- small cosmetic fixes
+
 * Mon Feb 13 2006 Peter Lemenkov  - 1.4-1
 - Version 1.4
 



From fedora-extras-commits at redhat.com  Mon Feb 13 12:23:50 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon, 13 Feb 2006 07:23:50 -0500
Subject: rpms/fuse/FC-4 fuse-udev_rules.patch,1.1,1.2 fuse.spec,1.3,1.4
Message-ID: <200602131224.k1DCOMth000542@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	fuse-udev_rules.patch fuse.spec 
Log Message:

Proper udev rules



fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse-udev_rules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fuse-udev_rules.patch	23 Nov 2005 19:29:35 -0000	1.1
+++ fuse-udev_rules.patch	13 Feb 2006 12:23:49 -0000	1.2
@@ -1,5 +1,26 @@
-diff -u util.org/udev.rules util/udev.rules
---- util.org/udev.rules	2005-11-03 19:38:05.000000000 +0100
+--- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
++++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
+@@ -24,7 +24,7 @@
+ 
+ install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
+-	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
++	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+--- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
++++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
+@@ -465,7 +465,7 @@
+ 
+ install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
+-	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
++	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+--- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
 -KERNEL="fuse", NAME="%k", MODE="0666"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse.spec	7 Feb 2006 20:52:24 -0000	1.3
+++ fuse.spec	13 Feb 2006 12:23:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -11,8 +11,7 @@
 Source2:	fuse-makedev.d-fuse
 Source3:	fuse-README.fedora
 
-#Patch0:		fuse-mount.fuse.patch
-Patch1:		fuse-udev_rules.patch
+Patch0:		fuse-udev_rules.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	kernel >= 2.6.14
 Requires(pre):	  %{_sbindir}/groupadd
@@ -43,6 +42,7 @@
 Summary:        File System in Userspace (FUSE) devel files
 Group:          Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires: 	pkgconfig
 License:        LGPL
 
 %description devel
@@ -55,8 +55,7 @@
 %setup -q
 #disable device creation during build/install
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
-#%patch0 -b .patch0
-%patch1 -b .patch1
+%patch0 -b .patch0
 cp %{SOURCE3} README.fedora
 
 %build
@@ -70,7 +69,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -102,8 +101,8 @@
 /sbin/mount.fuse
 %attr(4754,root,fuse) %{_bindir}/fusermount
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/40-fuse.rules
-%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+%{_sysconfdir}/udev/rules.d/60-fuse.rules
+%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
@@ -117,6 +116,12 @@
 %{_includedir}/fuse
 
 %changelog
+* Mon Feb 13 2006 Peter Lemenkov  - 2.5.2-3
+- Proper udev rule
+
+* Mon Feb 13 2006 Peter Lemenkov  - 2.5.2-2
+- Added missing requires
+
 * Tue Feb 07 2006 Peter Lemenkov  - 2.5.2-1
 - Update to 2.5.2
 - Dropped fuse-mount.fuse.patch



From fedora-extras-commits at redhat.com  Mon Feb 13 12:26:45 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 07:26:45 -0500
Subject: rpms/xmms/devel xmms.spec,1.13,1.14
Message-ID: <200602131227.k1DCRHIx000603@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xmms.spec 
Log Message:
Spec file cleanup and rebuild for new gcc/glibc.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xmms.spec	28 Dec 2005 14:25:41 -0000	1.13
+++ xmms.spec	13 Feb 2006 12:26:45 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -26,16 +26,16 @@
 Requires: /usr/share/desktop-menu-patches/redhat-audio-player.desktop
 Requires: redhat-menus >= 0.11
 
-BuildRequires: gtk+-devel esound-devel arts-devel alsa-lib-devel
-BuildRequires: libvorbis-devel mikmod-devel
-BuildRequires: libSM-devel
-BuildRequires: libXxf86vm-devel
-BuildRequires: mesa-libGL-devel
+BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel
+BuildRequires: libvorbis-devel, mikmod-devel
+BuildRequires: libSM-devel, libXxf86vm-devel, mesa-libGL-devel
 BuildRequires: zlib-devel
-Requires(pre): desktop-file-utils >= 0.9
+Requires(post): desktop-file-utils >= 0.9
+Requires(postun): desktop-file-utils >= 0.9
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Obsoletes: x11amp0.7-1-1 x11amp xmms-esd xmms-gl xmms-mikmod xmms-gnome
+Obsoletes: xmms-esd xmms-gl xmms-mikmod xmms-gnome
 
+# This is to avoid requiring all of arts, esound, alsa...
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE2}
 
@@ -44,15 +44,15 @@
 an interface similar to Winamp's. Xmms supports playlists and
 streaming content and has a configurable interface.
 
+
 %package devel
-Summary: Static libraries and header files for Xmms plug-in development.
+Summary: Files required for XMMS plug-in development
 Group: Development/Libraries
-Obsoletes: x11amp-devel
-Requires: %{name} = %{epoch}:%{version} gtk+-devel
+Requires: %{name} = %{epoch}:%{version}, gtk+-devel
 
 %description devel
-The static libraries and header files needed for building plug-ins for
-the Xmms multimedia player.
+Files needed for building plug-ins for the X MultiMedia System.
+
 
 %prep
 %setup -q
@@ -77,51 +77,49 @@
 # Fix compilation with gcc4
 %patch11 -p1 -b .gcc4
 
+
 %build
 %configure \
-  --disable-dependency-tracking \
-  --enable-kanji \
-  --enable-texthack \
-  --enable-ipv6 \
-  --with-pic
-for i in `find . -name Makefile`; do
-  cat $i | sed s/-lpthread//g > $i.tmp
-  mv $i.tmp $i
-done
-make
+    --disable-dependency-tracking \
+    --enable-kanji \
+    --enable-texthack \
+    --enable-ipv6 \
+    --with-pic
+# Hack around old libtool and x86_64 issue
+#for i in `find . -name Makefile`; do
+#    cat $i | sed s/-lpthread//g > $i.tmp
+#    mv $i.tmp $i
+#done
+%{__make} %{?_smp_mflags}
+
+# Compile the default mp3 "warning dialog" plugin
+%{__cc} %{optflags} -fPIC -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
+    -I. `gtk-config --cflags gtk` %{SOURCE5}
 
-gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
-     %{SOURCE5} -I. `gtk-config --cflags gtk`
 
 %install
-rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot}
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%find_lang %{name}
 
-install -m 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input
+# Install default mp3 "warning dialog" plugin
+%{__install} -m 0755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input/
 
-mkdir -pv %{buildroot}%{_datadir}/applications
-(cd $RPM_BUILD_ROOT%{_datadir}/applications && ln -sf \
-  %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop)
+# Link to the desktop menu entry included in redhat-menus
+%{__mkdir_p} %{buildroot}%{_datadir}/applications
+%{__ln_s} %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop \
+    %{buildroot}%{_datadir}/applications/
 
-mkdir -p %{buildroot}%{_datadir}/pixmaps/mini
-install -m 644 xmms/xmms_logo.xpm %{buildroot}%{_datadir}/pixmaps/
-install -m 644 xmms/xmms_mini.xpm %{buildroot}%{_datadir}/pixmaps/mini/
-install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/
+# Install xmms.xpm, the Icon= from the menu entry
+%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/xmms.xpm
 
-# create empty skins directory to be included
-mkdir -p %{buildroot}%{_datadir}/xmms/Skins
+# Create empty Skins directory to be included
+%{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/
 
-# unpackaged files
-rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \
-      %{buildroot}/%{_libdir}/libxmms.la \
-      %{buildroot}/%{_libdir}/xmms/*/*.la \
-      %{buildroot}/%{_mandir}/man1/gnomexmms*
-
-%find_lang %{name}
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
+
 
 %post
 /sbin/ldconfig
@@ -131,29 +129,51 @@
 /sbin/ldconfig
 update-desktop-database -q || :
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README
+%doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
-%{_libdir}/libxmms.so.1*
-%{_libdir}/xmms/
-%{_datadir}/applications/*
+%{_libdir}/libxmms.so.*
+%dir %{_libdir}/xmms/
+%dir %{_libdir}/xmms/Effect/
+%dir %{_libdir}/xmms/General/
+%dir %{_libdir}/xmms/Input/
+%dir %{_libdir}/xmms/Output/
+%dir %{_libdir}/xmms/Visualization/
+%{_libdir}/xmms/Effect/*.so
+%{_libdir}/xmms/General/*.so
+%{_libdir}/xmms/Input/*.so
+%{_libdir}/xmms/Output/*.so
+%{_libdir}/xmms/Visualization/*.so
+%exclude %{_libdir}/xmms/*/*.la
+%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/xmms.xpm
-%{_datadir}/pixmaps/xmms_logo.xpm
-%{_datadir}/pixmaps/mini/xmms_mini.xpm
 %{_datadir}/xmms/
-%{_mandir}/man1/[wx]*
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,0755)
 %{_bindir}/xmms-config
 %{_includedir}/xmms/
-%{_libdir}/lib*.a
-%{_libdir}/lib*.so
+%exclude %{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
 %{_datadir}/aclocal/xmms.m4
 
+
 %changelog
+* Mon Feb 13 2006 Matthias Saou  1:1.2.10-20
+- Spec file cleanup.
+- Disable previous -lpthread hack, since it seems to work again now...
+- Remove very old x11amp obsoletes.
+- Exclude static libraries, update devel summary and description for it.
+- List all plugins directories in order to be aware of breakage if the
+  libtool problem ever happens again.
+- Fix post/postun scriplets.
+- Remove xmms_logo.xpm and xmms_mini.xpm, they should be unused.
+
 * Wed Dec 28 2005 Hans de Goede   1:1.2.10-19
 - Remove -lpthread from all LDFLAGS as this confuses the old libtool
   used by xmms on x86_64 (FE-bug #175493)



From fedora-extras-commits at redhat.com  Mon Feb 13 12:46:24 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 13 Feb 2006 07:46:24 -0500
Subject: rpms/pptp/devel pptp.spec, 1.5, 1.6 sources, 1.3, 1.4 .cvsignore,
	1.3, 1.4
Message-ID: <200602131246.k1DCkuu5000732@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	pptp.spec sources .cvsignore 
Log Message:
- new upstream version 1.7.1 (fixes #166394)
- include new document PROTOCOL-SECURITY
- cosmetic change: replace variables with macros



Index: pptp.spec
===================================================================
RCS file: /cvs/extras/rpms/pptp/devel/pptp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pptp.spec	10 Aug 2005 13:41:34 -0000	1.5
+++ pptp.spec	13 Feb 2006 12:46:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pptp
-Version:        1.7.0
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Point-to-Point Tunneling Protocol (PPTP) Client
 
 Group:          Applications/Internet
@@ -21,20 +21,20 @@
 %{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile
 
 %build
-%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS"
+%{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}"
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
-%{__install} -d -m 750 $RPM_BUILD_ROOT%{_localstatedir}/run/pptp
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
+%{__install} -d -m 750 %{buildroot}%{_localstatedir}/run/pptp
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
-%doc ChangeLog Documentation/DESIGN.PPTP
+%doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
 %{_sbindir}/pptp
 %{_mandir}/man8/pptp.8*
 %dir %attr(750,root,root) %{_localstatedir}/run/pptp
@@ -43,6 +43,11 @@
 %config(noreplace) /etc/ppp/options.pptp
 
 %changelog
+* Mon Feb 13 2006 Paul Howarth  1.7.1-1
+- new upstream version 1.7.1 (fixes #166394)
+- include new document PROTOCOL-SECURITY
+- cosmetic change: replace variables with macros
+
 * Wed Aug 10 2005 Paul Howarth  1.7.0-2
 - own directory %{_localstatedir}/run/pptp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pptp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2005 15:26:10 -0000	1.3
+++ sources	13 Feb 2006 12:46:24 -0000	1.4
@@ -1 +1 @@
-0bc7dbd1c265e4263008fa7883de58dd  pptp-1.7.0.tar.gz
+b47735ba5d6d37dfdbccb85afc044ede  pptp-1.7.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pptp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Jul 2005 15:26:10 -0000	1.3
+++ .cvsignore	13 Feb 2006 12:46:24 -0000	1.4
@@ -1 +1 @@
-pptp-1.7.0.tar.gz
+pptp-1.7.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 12:48:57 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 13 Feb 2006 07:48:57 -0500
Subject: rpms/pptp/FC-4 pptp.spec, 1.5, 1.6 sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4
Message-ID: <200602131249.k1DCnUHg000832@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

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



Index: pptp.spec
===================================================================
RCS file: /cvs/extras/rpms/pptp/FC-4/pptp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pptp.spec	10 Aug 2005 13:42:11 -0000	1.5
+++ pptp.spec	13 Feb 2006 12:48:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pptp
-Version:        1.7.0
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Point-to-Point Tunneling Protocol (PPTP) Client
 
 Group:          Applications/Internet
@@ -21,20 +21,20 @@
 %{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile
 
 %build
-%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS"
+%{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}"
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
-%{__install} -d -m 750 $RPM_BUILD_ROOT%{_localstatedir}/run/pptp
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
+%{__install} -d -m 750 %{buildroot}%{_localstatedir}/run/pptp
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
-%doc ChangeLog Documentation/DESIGN.PPTP
+%doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
 %{_sbindir}/pptp
 %{_mandir}/man8/pptp.8*
 %dir %attr(750,root,root) %{_localstatedir}/run/pptp
@@ -43,6 +43,11 @@
 %config(noreplace) /etc/ppp/options.pptp
 
 %changelog
+* Mon Feb 13 2006 Paul Howarth  1.7.1-1
+- new upstream version 1.7.1 (fixes #166394)
+- include new document PROTOCOL-SECURITY
+- cosmetic change: replace variables with macros
+
 * Wed Aug 10 2005 Paul Howarth  1.7.0-2
 - own directory %{_localstatedir}/run/pptp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pptp/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2005 15:40:40 -0000	1.3
+++ sources	13 Feb 2006 12:48:57 -0000	1.4
@@ -1 +1 @@
-0bc7dbd1c265e4263008fa7883de58dd  pptp-1.7.0.tar.gz
+b47735ba5d6d37dfdbccb85afc044ede  pptp-1.7.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pptp/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Jul 2005 15:40:40 -0000	1.3
+++ .cvsignore	13 Feb 2006 12:48:57 -0000	1.4
@@ -1 +1 @@
-pptp-1.7.0.tar.gz
+pptp-1.7.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 12:49:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 07:49:03 -0500
Subject: rpms/xmms-acme/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xmms-acme.spec, 1.4, 1.5
Message-ID: <200602131249.k1DCnZ5q000837@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-acme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv804

Modified Files:
	.cvsignore sources xmms-acme.spec 
Log Message:
Update to 0.4.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-acme/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:51:09 -0000	1.2
+++ .cvsignore	13 Feb 2006 12:49:02 -0000	1.3
@@ -1 +1 @@
-xmms-xf86audio-0.4.2.tar.gz
+xmms-xf86audio-0.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-acme/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:51:09 -0000	1.2
+++ sources	13 Feb 2006 12:49:02 -0000	1.3
@@ -1 +1 @@
-515912764ccdcdc7530ebce63fc8ad5c  xmms-xf86audio-0.4.2.tar.gz
+25d09c39eb35705bd11ee7e58e3f2f5a  xmms-xf86audio-0.4.3.tar.gz


Index: xmms-acme.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-acme/devel/xmms-acme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-acme.spec	23 May 2005 00:07:52 -0000	1.4
+++ xmms-acme.spec	13 Feb 2006 12:49:02 -0000	1.5
@@ -1,19 +1,16 @@
-# $Id$
-
 %define xmms_generaldir %(xmms-config --general-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General)
 
 Summary: XMMS plugin to use special multimedia keys in GNOME or through acme
 Name: xmms-acme
-Version: 0.4.2
-Release: 4
-
+Version: 0.4.3
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.devin.com/xmms-xf86audio/
 Source: http://www.devin.com/xmms-xf86audio/download/xmms-xf86audio-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xmms >= 1.0.0
-BuildRequires: xmms-devel, glib-devel, gtk+-devel
+BuildRequires: xmms-devel
 Provides: xmms-xf86audio = %{version}-%{release}
 
 %description
@@ -29,7 +26,7 @@
 
 
 %build
-%{__make} %{?_smp_mflags} OPT="%{optflags} -fPIC"
+%{__make} %{?_smp_mflags} OPT="%{optflags}"
 
 
 %install
@@ -49,6 +46,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Matthias Saou  0.4.3-1
+- Update to 0.4.3, which adds -fPIC where needed.
+
 * Sun May 22 2005 Jeremy Katz  - 0.4.2-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Mon Feb 13 12:50:34 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 13 Feb 2006 07:50:34 -0500
Subject: rpms/pptp/FC-3 pptp.spec, 1.5, 1.6 sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4
Message-ID: <200602131251.k1DCp60F000953@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

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



Index: pptp.spec
===================================================================
RCS file: /cvs/extras/rpms/pptp/FC-3/pptp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pptp.spec	10 Aug 2005 13:42:35 -0000	1.5
+++ pptp.spec	13 Feb 2006 12:50:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pptp
-Version:        1.7.0
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        Point-to-Point Tunneling Protocol (PPTP) Client
 
 Group:          Applications/Internet
@@ -21,20 +21,20 @@
 %{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile
 
 %build
-%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS"
+%{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}"
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
-%{__install} -d -m 750 $RPM_BUILD_ROOT%{_localstatedir}/run/pptp
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
+%{__install} -d -m 750 %{buildroot}%{_localstatedir}/run/pptp
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
-%doc ChangeLog Documentation/DESIGN.PPTP
+%doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
 %{_sbindir}/pptp
 %{_mandir}/man8/pptp.8*
 %dir %attr(750,root,root) %{_localstatedir}/run/pptp
@@ -43,6 +43,11 @@
 %config(noreplace) /etc/ppp/options.pptp
 
 %changelog
+* Mon Feb 13 2006 Paul Howarth  1.7.1-1
+- new upstream version 1.7.1 (fixes #166394)
+- include new document PROTOCOL-SECURITY
+- cosmetic change: replace variables with macros
+
 * Wed Aug 10 2005 Paul Howarth  1.7.0-2
 - own directory %{_localstatedir}/run/pptp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pptp/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2005 15:42:39 -0000	1.3
+++ sources	13 Feb 2006 12:50:33 -0000	1.4
@@ -1 +1 @@
-0bc7dbd1c265e4263008fa7883de58dd  pptp-1.7.0.tar.gz
+b47735ba5d6d37dfdbccb85afc044ede  pptp-1.7.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pptp/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Jul 2005 15:42:39 -0000	1.3
+++ .cvsignore	13 Feb 2006 12:50:33 -0000	1.4
@@ -1 +1 @@
-pptp-1.7.0.tar.gz
+pptp-1.7.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 12:53:38 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 07:53:38 -0500
Subject: rpms/xmms-arts/devel xmms-arts.spec,1.1,1.2
Message-ID: <200602131254.k1DCsAIp001026@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-arts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1008

Modified Files:
	xmms-arts.spec 
Log Message:
Add missing make call in %build.



Index: xmms-arts.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-arts/devel/xmms-arts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms-arts.spec	15 Apr 2005 20:15:51 -0000	1.1
+++ xmms-arts.spec	13 Feb 2006 12:53:38 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: X MultiMedia System output plugin for the aRts sound system
 Name: xmms-arts
 Version: 0.7.1
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.xmms.org/
@@ -25,6 +25,7 @@
 
 %build
 %configure
+%{__make} %{?_smp_mflags}
 
 
 %install
@@ -44,6 +45,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Matthias Saou  0.7.1-2
+- Add missing make call in %%build.
+
 * Thu Apr 14 2005 Matthias Saou  0.7.1-1
 - Split off xmms-arts from the main xmms package.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 13:29:33 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 08:29:33 -0500
Subject: rpms/xmms-crossfade/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xmms-crossfade.spec, 1.9,
	1.10 xmms-crossfade-0.3.8-gcc4.patch, 1.1, NONE
Message-ID: <200602131330.k1DDU5ir003051@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-crossfade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3027

Modified Files:
	.cvsignore sources xmms-crossfade.spec 
Removed Files:
	xmms-crossfade-0.3.8-gcc4.patch 
Log Message:
Update to 0.3.10 and spec file cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 05:36:28 -0000	1.4
+++ .cvsignore	13 Feb 2006 13:29:33 -0000	1.5
@@ -1 +1 @@
-xmms-crossfade-0.3.8.tar.gz
+xmms-crossfade-0.3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 05:36:28 -0000	1.4
+++ sources	13 Feb 2006 13:29:33 -0000	1.5
@@ -1 +1 @@
-fbfff1bff29118309b0a02c713b13d50  xmms-crossfade-0.3.8.tar.gz
+43c53b522545253e2bfeee7a0c0dfde3  xmms-crossfade-0.3.10.tar.gz


Index: xmms-crossfade.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-crossfade/devel/xmms-crossfade.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-crossfade.spec	13 Apr 2005 12:03:27 -0000	1.9
+++ xmms-crossfade.spec	13 Feb 2006 13:29:33 -0000	1.10
@@ -1,53 +1,54 @@
-%define plugdir %(xmms-config --output-plugin-dir 2>/dev/null)
+%define xmms_outputdir %(xmms-config --output-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/Output)
 
-Name:           xmms-crossfade
-Version:        0.3.8
-Release:        4
-Summary:        A crossfade output plugin for XMMS
-
-Group:          Applications/Multimedia
-License:        GPL
-URL:            http://www.eisenlohr.org/xmms-crossfade/
-Source0:        http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-0.3.8.tar.gz
-Patch0:         xmms-crossfade-0.3.8-gcc4.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  xmms-devel
-BuildRequires:  libsamplerate-devel
-Requires:       xmms
+Summary: Audio crossfade plugin for XMMS
+Name: xmms-crossfade
+Version: 0.3.10
+Release: 1%{?dist}
+License: GPL
+Group: Applications/Multimedia
+URL: http://www.eisenlohr.org/xmms-crossfade/
+Source: http://www.eisenlohr.org/xmms-crossfade/xmms-crossfade-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: xmms >= 1.2.10-20
+BuildRequires: xmms-devel, libsamplerate-devel
 
 %description
-A plugin for XMMS featuring crossfading, continuous output between
-songs and a gap-killer.
+A plugin for XMMS featuring crossfading, continuous output between songs and
+a gap-killer.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
 
 
 %build
-%configure --libdir=%{plugdir}
-make %{?_smp_mflags}
+%configure --libdir=%{xmms_outputdir}
+%{__make} %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall libdir=$RPM_BUILD_ROOT%{plugdir}
-rm -f $RPM_BUILD_ROOT%{plugdir}/libcrossfade.la
+%{__rm} -rf %{buildroot}
+%makeinstall libdir=%{buildroot}%{xmms_outputdir}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files
-%defattr(-, root, root, -)
+%defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{plugdir}/*
+%exclude %{xmms_outputdir}/libcrossfade.la
+%{xmms_outputdir}/libcrossfade.so
 
 
 %changelog
+* Mon Feb 13 2006 Matthias Saou  0.3.10-1
+- Update to 0.3.10.
+- Spec file cleanup.
+- Remove no longer needed gcc4 patch.
+- Require xmms >= 1.2.10-20 since it includes the required patches.
+
 * Wed Apr 13 2005 Michael Schwendt  - 0.3.8-4
 - Add patch0 for GCC4 to fix some storage class mismatches.
 


--- xmms-crossfade-0.3.8-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Feb 13 13:31:23 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 08:31:23 -0500
Subject: rpms/xmms/devel xmms-1.2.10-crossfade-0.3.9.patch, NONE,
	1.1 xmms.spec, 1.14, 1.15
Message-ID: <200602131331.k1DDVtVC003077@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xmms.spec 
Added Files:
	xmms-1.2.10-crossfade-0.3.9.patch 
Log Message:
Add crossfade patch.


xmms-1.2.10-crossfade-0.3.9.patch:

--- NEW FILE xmms-1.2.10-crossfade-0.3.9.patch ---
diff -ur xmms-1.2.10/xmms/input.c xmms-1.2.10.patched/xmms/input.c
--- xmms-1.2.10/xmms/input.c	2003-08-08 19:10:44.000000000 +0200
+++ xmms-1.2.10.patched/xmms/input.c	2005-11-25 00:12:36.000000000 +0100
@@ -285,6 +285,14 @@
 	}
 }
 
+gboolean input_stopped_for_restart = FALSE;  /* crossfade */
+void input_stop_for_restart()  /* crossfade */
+{
+	input_stopped_for_restart = TRUE;
+	input_stop();
+	input_stopped_for_restart = FALSE;
+}
+
 void input_stop(void)
 {
 	if (ip_data->playing && get_current_input_plugin())
diff -ur xmms-1.2.10/xmms/input.h xmms-1.2.10.patched/xmms/input.h
--- xmms-1.2.10/xmms/input.h	2000-02-16 22:05:57.000000000 +0100
+++ xmms-1.2.10.patched/xmms/input.h	2005-11-25 00:12:36.000000000 +0100
@@ -34,6 +34,7 @@
 gboolean input_check_file(gchar * filename);
 void input_play(char *filename);
 void input_stop(void);
+void input_stop_for_restart(void);
 void input_pause(void);
 int input_get_time(void);
 void input_set_eq(int on, float preamp, float *bands);
diff -ur xmms-1.2.10/xmms/main.c xmms-1.2.10.patched/xmms/main.c
--- xmms-1.2.10/xmms/main.c	2004-02-23 21:31:43.000000000 +0100
+++ xmms-1.2.10.patched/xmms/main.c	2005-11-25 00:12:36.000000000 +0100
@@ -881,8 +881,10 @@
 	mainwin_set_shade(!cfg.player_shaded);
 }
 
+gboolean is_quitting = FALSE;  /* crossfade */
 void mainwin_quit_cb(void)
 {
+	is_quitting = TRUE;  /* crossfade */
 	input_stop();
 	gtk_widget_hide(equalizerwin);
 	gtk_widget_hide(playlistwin);
@@ -1523,7 +1525,8 @@
 		int *pos;
 
 		if (get_input_playing())
-			input_stop();
+			input_stop_for_restart();
+		
 		pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data));
 		playlist_set_position(*pos);
 		playlist_play();
diff -ur xmms-1.2.10/xmms/playlist.c xmms-1.2.10.patched/xmms/playlist.c
--- xmms-1.2.10/xmms/playlist.c	2004-02-23 21:31:43.000000000 +0100
+++ xmms-1.2.10.patched/xmms/playlist.c	2005-11-25 00:12:36.000000000 +0100
@@ -124,7 +124,7 @@
 		if (get_input_playing())
 		{
 			PL_UNLOCK();
-			input_stop();
+			input_stop_for_restart();
 			PL_LOCK();
 			*restart_playing = TRUE;
 		}
@@ -570,7 +570,7 @@
 	}
 
 	if (get_input_playing())
-		input_stop();
+		input_stop_for_restart();
 
 	vis_clear_data(mainwin_vis);
 	vis_clear_data(playlistwin_vis);
@@ -668,7 +668,7 @@
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}
@@ -723,7 +723,7 @@
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}
@@ -852,7 +852,7 @@
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xmms.spec	13 Feb 2006 12:26:45 -0000	1.14
+++ xmms.spec	13 Feb 2006 13:31:23 -0000	1.15
@@ -20,6 +20,7 @@
 Patch9: xmms-underquoted.patch
 Patch10: xmms-alsa-backport.patch
 Patch11: xmms-1.2.10-gcc4.patch
+Patch12: xmms-1.2.10-crossfade-0.3.9.patch
 
 Requires: unzip
 # the desktop file and redhat-menus are redundant requires really
@@ -27,9 +28,9 @@
 Requires: redhat-menus >= 0.11
 
 BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel
-BuildRequires: libvorbis-devel, mikmod-devel
-BuildRequires: libSM-devel, libXxf86vm-devel, mesa-libGL-devel
-BuildRequires: zlib-devel
+BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel
+BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel, mesa-libGL-devel
+BuildRequires: gettext-devel, zlib-devel
 Requires(post): desktop-file-utils >= 0.9
 Requires(postun): desktop-file-utils >= 0.9
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -76,6 +77,8 @@
 %patch10 -p0 -b .alsa-backport
 # Fix compilation with gcc4
 %patch11 -p1 -b .gcc4
+# Fix for crossfade >= 0.3.9 to work properly
+%patch12 -p1 -b .crossfade
 
 
 %build
@@ -167,12 +170,15 @@
 * Mon Feb 13 2006 Matthias Saou  1:1.2.10-20
 - Spec file cleanup.
 - Disable previous -lpthread hack, since it seems to work again now...
+- Include crossfade 0.3.9 patch.
 - Remove very old x11amp obsoletes.
 - Exclude static libraries, update devel summary and description for it.
 - List all plugins directories in order to be aware of breakage if the
   libtool problem ever happens again.
 - Fix post/postun scriplets.
 - Remove xmms_logo.xpm and xmms_mini.xpm, they should be unused.
+- Add libXt-devel to fullfill the "checking for X..." configure check.
+- Add gettext-devel to make more configure checks happy.
 
 * Wed Dec 28 2005 Hans de Goede   1:1.2.10-19
 - Remove -lpthread from all LDFLAGS as this confuses the old libtool



From fedora-extras-commits at redhat.com  Mon Feb 13 13:45:25 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 08:45:25 -0500
Subject: rpms/xmms/devel xmms.spec,1.15,1.16
Message-ID: <200602131345.k1DDjvsc003215@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xmms.spec 
Log Message:
Build worked for me, but not for the buildsys, so re-enable -lpthread hack.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xmms.spec	13 Feb 2006 13:31:23 -0000	1.15
+++ xmms.spec	13 Feb 2006 13:45:25 -0000	1.16
@@ -89,10 +89,10 @@
     --enable-ipv6 \
     --with-pic
 # Hack around old libtool and x86_64 issue
-#for i in `find . -name Makefile`; do
-#    cat $i | sed s/-lpthread//g > $i.tmp
-#    mv $i.tmp $i
-#done
+for i in `find . -name Makefile`; do
+    cat $i | sed s/-lpthread//g > $i.tmp
+    mv $i.tmp $i
+done
 %{__make} %{?_smp_mflags}
 
 # Compile the default mp3 "warning dialog" plugin
@@ -169,7 +169,6 @@
 %changelog
 * Mon Feb 13 2006 Matthias Saou  1:1.2.10-20
 - Spec file cleanup.
-- Disable previous -lpthread hack, since it seems to work again now...
 - Include crossfade 0.3.9 patch.
 - Remove very old x11amp obsoletes.
 - Exclude static libraries, update devel summary and description for it.



From fedora-extras-commits at redhat.com  Mon Feb 13 13:46:12 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 08:46:12 -0500
Subject: rpms/xmms-flac/devel xmms-flac.spec,1.4,1.5
Message-ID: <200602131346.k1DDkiE2003274@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3221

Modified Files:
	xmms-flac.spec 
Log Message:
Rebuild for new glibc/gcc.



Index: xmms-flac.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/devel/xmms-flac.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-flac.spec	22 Nov 2005 11:31:29 -0000	1.4
+++ xmms-flac.spec	13 Feb 2006 13:46:12 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
 Version: 1.1.2
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Matthias Saou  1.1.2-26
+- Rebuild for new glibc/gcc.
+
 * Tue Nov 22 2005 Matthias Saou  1.1.2-25
 - Update patch with one provided from FLAC CVS by ??yvind Stegard to further
   fix configuration dialog crashes (#173723).



From fedora-extras-commits at redhat.com  Mon Feb 13 13:54:03 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 13 Feb 2006 08:54:03 -0500
Subject: rpms/byzanz/devel byzanz.spec,1.4,1.5
Message-ID: <200602131354.k1DDsZ4v003306@cvs-int.fedora.redhat.com>

Author: jcollie

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

Modified Files:
	byzanz.spec 
Log Message:
Bump release for rebuild.


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- byzanz.spec	27 Jan 2006 05:19:59 -0000	1.4
+++ byzanz.spec	13 Feb 2006 13:54:03 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
 Version: 0.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -87,6 +87,9 @@
 %{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png
 
 %changelog
+* Mon Feb 13 2006 Jeffrey C. Ollie  - 0.1.0-3
+- Bump release and rebuild for new gcc4.1 and glibc.
+
 * Thu Jan 26 2006 Jeffrey C. Ollie  - 0.1.0-2
 - Add post and postun scripts to update the GTK+ icon cache.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 13:55:34 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 13 Feb 2006 08:55:34 -0500
Subject: rpms/byzanz/devel byzanz.spec,1.5,1.6
Message-ID: <200602131356.k1DDu6Md003361@cvs-int.fedora.redhat.com>

Author: jcollie

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

Modified Files:
	byzanz.spec 
Log Message:
Bump release for rebuild.


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- byzanz.spec	13 Feb 2006 13:54:03 -0000	1.5
+++ byzanz.spec	13 Feb 2006 13:55:34 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
 Version: 0.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -87,6 +87,9 @@
 %{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png
 
 %changelog
+* Mon Feb 13 2006 Jeffrey C. Ollie  - 0.1.0-4
+- Bump release again.
+
 * Mon Feb 13 2006 Jeffrey C. Ollie  - 0.1.0-3
 - Bump release and rebuild for new gcc4.1 and glibc.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 14:08:00 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 13 Feb 2006 09:08:00 -0500
Subject: rpms/libeXosip2/devel libeXosip2.spec,1.4,1.5
Message-ID: <200602131408.k1DE8Xv6005876@cvs-int.fedora.redhat.com>

Author: jcollie

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

Modified Files:
	libeXosip2.spec 
Log Message:
Bump release and rebuild.


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/libeXosip2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libeXosip2.spec	5 Jan 2006 04:57:22 -0000	1.4
+++ libeXosip2.spec	13 Feb 2006 14:08:00 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
 Version: 2.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Mon Feb 13 14:12:02 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 09:12:02 -0500
Subject: rpms/xmms-lirc/devel xmms-lirc.spec,1.7,1.8
Message-ID: <200602131412.k1DECYtc005994@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5930

Modified Files:
	xmms-lirc.spec 
Log Message:
Rebuild for new gcc/glibc, spec file cleanup and use CFLAGS.



Index: xmms-lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-lirc/devel/xmms-lirc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmms-lirc.spec	22 May 2005 23:20:21 -0000	1.7
+++ xmms-lirc.spec	13 Feb 2006 14:12:01 -0000	1.8
@@ -1,17 +1,15 @@
-%define xmms_generaldir %(xmms-config --general-plugin-dir)
-%define real_name       lirc-xmms-plugin
+%define xmms_generaldir %(xmms-config --general-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General)
 
 Summary: X MultiMedia System control plugin to use infrared devices
 Name: xmms-lirc
 Version: 1.4
-Release: 6
+Release: 7%{?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 >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7, lirc
-BuildRequires: xmms-devel, glib-devel >= 1.2.7, gtk+-devel >= 1.2.7, lirc-devel
+BuildRequires: xmms-devel, lirc-devel
 
 
 %description
@@ -19,17 +17,17 @@
 
 
 %prep
-%setup -n %{real_name}-%{version}
+%setup -n lirc-xmms-plugin-%{version}
 
 
 %build
-./configure
-%{__make} %{?_smp_mflags}
+%configure --libdir=%{xmms_generaldir}
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%makeinstall libdir=%{buildroot}%{xmms_generaldir}
 
 
 %clean
@@ -39,11 +37,16 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{xmms_generaldir}/liblirc.so
 %exclude %{xmms_generaldir}/liblirc.la
+%{xmms_generaldir}/liblirc.so
 
 
 %changelog
+* Mon Feb 13 2006 Matthias Saou  1.4-7
+- Rebuild for new gcc/glibc.
+- Spec file cleanup.
+- Override CFLAGS to have ours used.
+
 * Sun May 22 2005 Jeremy Katz  - 1.4-6
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Mon Feb 13 14:21:31 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Feb 2006 09:21:31 -0500
Subject: rpms/xmms-speex/devel xmms-speex.spec,1.5,1.6
Message-ID: <200602131422.k1DEM3TP006209@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms-speex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6192

Modified Files:
	xmms-speex.spec 
Log Message:
Rebuild for new gcc/glibc.



Index: xmms-speex.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-speex/devel/xmms-speex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms-speex.spec	14 Apr 2005 15:50:24 -0000	1.5
+++ xmms-speex.spec	13 Feb 2006 14:21:31 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: X MultiMedia System input plugin to play speex files
 Name: xmms-speex
 Version: 0.9.1
-Release: 5
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://jzb.rapanden.dk/projects/speex-xmms
@@ -11,8 +11,7 @@
 Patch0: speex-xmms-0.9.1.patch
 Patch1: speex-xmms-0.9.1-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xmms >= 1.0.0, glib >= 1.2.7, gtk+ >= 1.2.7
-BuildRequires: xmms-devel, gtk+-devel, speex-devel, libogg-devel
+BuildRequires: xmms-devel, speex-devel, libogg-devel
 
 
 %description
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Matthias Saou  0.9.1-6
+- Rebuild for new gcc/glibc.
+
 * Tue Nov 16 2004 Matthias Saou  0.9.1-5
 - Include gcc4 patch from Michael Schwendt.
 - The URL and Source headers no longer to point to a valid location, but no



From fedora-extras-commits at redhat.com  Mon Feb 13 15:36:14 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 13 Feb 2006 10:36:14 -0500
Subject: rpms/nazghul - New directory
Message-ID: <200602131536.k1DFaGxd008347@cvs-int.fedora.redhat.com>

Author: tibbs

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

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




From fedora-extras-commits at redhat.com  Mon Feb 13 15:36:19 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 13 Feb 2006 10:36:19 -0500
Subject: rpms/nazghul/devel - New directory
Message-ID: <200602131536.k1DFaMr7008362@cvs-int.fedora.redhat.com>

Author: tibbs

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

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




From fedora-extras-commits at redhat.com  Mon Feb 13 15:36:33 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 13 Feb 2006 10:36:33 -0500
Subject: rpms/nazghul Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602131536.k1DFaZdT008423@cvs-int.fedora.redhat.com>

Author: tibbs

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 13 15:36:39 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 13 Feb 2006 10:36:39 -0500
Subject: rpms/nazghul/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200602131536.k1DFafdN008451@cvs-int.fedora.redhat.com>

Author: tibbs

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

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


--- NEW 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 Feb 13 15:36:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Feb 2006 10:36:27 -0500
Subject: rpms/Glide3/devel Glide3.spec,1.13,1.14
Message-ID: <200602131536.k1DFaxS2008484@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	Glide3.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  20050815-3
- Bump release and rebuild for new gcc4.1 and glibc.
- add %{?dist} for consistency with my other packages



Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Glide3.spec	16 Jan 2006 15:54:52 -0000	1.13
+++ Glide3.spec	13 Feb 2006 15:36:27 -0000	1.14
@@ -1,6 +1,6 @@
 Name:    Glide3
 Version: 20050815
-Release: 2
+Release: 3%{?dist}
 Summary: Glide3 runtime for the 3Dfx Voodoo family of cards
 # Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
 ExclusiveArch: %{ix86} alpha ia64 x86_64
@@ -131,6 +131,10 @@
 
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede  20050815-3
+- Bump release and rebuild for new gcc4.1 and glibc.
+- add %%{?dist} for consistency with my other packages
+
 * Mon Jan 16 2006 Hans de Goede  20050815-2
 - Add modular Xorg BuildReqs
 - Add a patch which fixes gcc4.1 warnings



From fedora-extras-commits at redhat.com  Mon Feb 13 15:37:15 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 13 Feb 2006 10:37:15 -0500
Subject: rpms/nazghul import.log,1.1,1.2
Message-ID: <200602131537.k1DFbl8G008590@cvs-int.fedora.redhat.com>

Author: tibbs

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nazghul/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Feb 2006 15:36:32 -0000	1.1
+++ import.log	13 Feb 2006 15:37:14 -0000	1.2
@@ -0,0 +1 @@
+nazghul-0_5_3-2:HEAD:nazghul-0.5.3-2.src.rpm:1139845029



From fedora-extras-commits at redhat.com  Mon Feb 13 15:37:20 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 13 Feb 2006 10:37:20 -0500
Subject: rpms/nazghul/devel haxima.desktop, NONE, 1.1 haxima.png, NONE,
	1.1 nazghul-haxima-startup.patch, NONE, 1.1 nazghul.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602131537.k1DFbrNm008594@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	.cvsignore sources 
Added Files:
	haxima.desktop haxima.png nazghul-haxima-startup.patch 
	nazghul.spec 
Log Message:
auto-import nazghul-0.5.3-2 on branch devel from nazghul-0.5.3-2.src.rpm


--- NEW FILE haxima.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Haxima
GenericName=Role Playing Game
Comment=An old school role playing game
Exec=haxima
Icon=haxima.png
Terminal=false
Type=Application
Categories=Application;Game;
Version=1.002

nazghul-haxima-startup.patch:

--- NEW FILE nazghul-haxima-startup.patch ---
--- worlds/haxima-1.002/Makefile.in.orig	2006-02-07 08:49:40.643978022 -0600
+++ worlds/haxima-1.002/Makefile.in	2006-02-07 08:50:17.740819277 -0600
@@ -398,7 +398,7 @@
 
 haxima.sh: Makefile
 	echo '#!/bin/sh' > $@ 
-	echo '"@bindir@/nazghul" -I "@datadir@/nazghul/haxima" -G "$(HOME)/.haxima" "$$@"' >> $@
+	echo '"@bindir@/nazghul" -I "@datadir@/nazghul/haxima" -G "$$HOME/.haxima" "$$@"' >> $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


--- NEW FILE nazghul.spec ---
Name:           nazghul
Version:        0.5.3
Release:        2%{?dist}
Summary:        A computer role-playing game (CRPG) engine

Group:          Amusements/Games
License:        GPL
URL:            http://myweb.cableone.net/gmcnutt/nazghul.html
Source0:        http://dl.sourceforge.net/nazghul/nazghul-%{version}.tar.gz
Source1:	haxima.desktop
Source2:	haxima.png
Patch0:		nazghul-haxima-startup.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	SDL_image-devel, desktop-file-utils

%description
Nazghul is an old-school RPG engine modeled after those made in the
heyday of top-down, 2d tile-based graphics. It is specifically modeled
after Ultima V.


%package haxima
Summary:	A full-featured role-playing game for the Nazghul engine
Group:		Amusements/Games
Requires:	nazghul = %{version}

%description haxima
A complete, playable and full-featured role playing game which runs
under the Nazghul CRPG engine.

You must install Nazghul in order to play Haxima.


%prep
%setup -q
%patch0


%build
%configure
make %{?_smp_mflags}


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

mv $RPM_BUILD_ROOT/%{_bindir}/haxima.sh $RPM_BUILD_ROOT/%{_bindir}/haxima

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

install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/haxima.png


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/nazghul
%dir %{_datadir}/nazghul
%doc AUTHORS ChangeLog COPYING INSTALL NEWS


%files haxima
%defattr(-,root,root,-)
%{_bindir}/haxima
%{_datadir}/nazghul/haxima
%{_datadir}/applications/fedora-haxima.desktop
%{_datadir}/pixmaps/haxima.png


%changelog
* Tue Feb  7 2006 Jason L Tibbitts III  - 0.5.3-2
- Incorporate some review suggestions
- Patch bug with generation of haxima.sh.

* Sun Feb  5 2006 Jason L Tibbitts III  - 0.5.3-1
- Update to 0.5.3

* Sat Jan 28 2006 Jason L Tibbitts III  - 0.5.2-1
- Initial attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Feb 2006 15:36:38 -0000	1.1
+++ .cvsignore	13 Feb 2006 15:37:20 -0000	1.2
@@ -0,0 +1 @@
+nazghul-0.5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Feb 2006 15:36:38 -0000	1.1
+++ sources	13 Feb 2006 15:37:20 -0000	1.2
@@ -0,0 +1 @@
+a78342489f494eeb2c4755a293ed8a1c  nazghul-0.5.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 15:39:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Feb 2006 10:39:09 -0500
Subject: rpms/goffice/devel goffice.spec,1.6,1.7
Message-ID: <200602131539.k1DFdg6C008648@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	goffice.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  0.1.2-4
- Bump release and rebuild for new gcc4.1 and glibc.
- add %{?dist} for consistency with my other packages



Index: goffice.spec
===================================================================
RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- goffice.spec	8 Dec 2005 13:22:06 -0000	1.6
+++ goffice.spec	13 Feb 2006 15:39:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		goffice         
 Version: 	0.1.2
-Release:        3
+Release:        4%{?dist}
 Summary:        Goffice support libraries
 
 Group:          System Environment/Libraries
@@ -69,6 +69,10 @@
 
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede  0.1.2-4
+- Bump release and rebuild for new gcc4.1 and glibc.
+- add %%{?dist} for consistency with my other packages
+
 * Thu Dec  8 2005 Hans de Goede  0.1.2-3
 -Switch to core version of libgsf now Core has 1.13 instead of using special
  Extras libgsf113 version.



From fedora-extras-commits at redhat.com  Mon Feb 13 15:41:42 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 13 Feb 2006 10:41:42 -0500
Subject: owners owners.list,1.633,1.634
Message-ID: <200602131542.k1DFgFdv008764@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	owners.list 
Log Message:
Add entry for nazghul.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -r1.633 -r1.634
--- owners.list	12 Feb 2006 02:29:49 -0000	1.633
+++ owners.list	13 Feb 2006 15:41:42 -0000	1.634
@@ -670,6 +670,7 @@
 Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-sendto|Nautilus context menu for sending files|stickster at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|nazghul|A computer role-playing game (CRPG) engine|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ncarg|A Fortran and C based software package for scientific visualization|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|ncftp|Improved console FTP client|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ncmpc|A curses client for the Music Player Daemon (MPD)|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Feb 13 15:42:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Feb 2006 10:42:26 -0500
Subject: rpms/overgod/devel overgod.spec,1.1,1.2
Message-ID: <200602131542.k1DFgxda008857@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	overgod.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  1.0-3
- Bump release and rebuild for new gcc4.1 and glibc.



Index: overgod.spec
===================================================================
RCS file: /cvs/extras/rpms/overgod/devel/overgod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- overgod.spec	31 Jan 2006 21:17:33 -0000	1.1
+++ overgod.spec	13 Feb 2006 15:42:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           overgod
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Another Asteroid like game
 Group:          Amusements/Games
 License:        GPL
@@ -73,6 +73,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/overgod.png
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede  1.0-3
+- Bump release and rebuild for new gcc4.1 and glibc.
+
 * Tue Jan 31 2006 Hans de Goede  1.0-2
 - Fixup description (bz 178625)
 



From fedora-extras-commits at redhat.com  Mon Feb 13 15:43:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Feb 2006 10:43:43 -0500
Subject: rpms/lacewing/devel lacewing.spec,1.1,1.2
Message-ID: <200602131544.k1DFiFIZ008940@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	lacewing.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  1.10-4
- Bump release and rebuild for new gcc4.1 and glibc.



Index: lacewing.spec
===================================================================
RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lacewing.spec	30 Jan 2006 21:34:11 -0000	1.1
+++ lacewing.spec	13 Feb 2006 15:43:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lacewing
 Version:        1.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Asteroid like game with many different ships
 Group:          Amusements/Games
 License:        GPL
@@ -80,6 +80,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/lacewing.png
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede  1.10-4
+- Bump release and rebuild for new gcc4.1 and glibc.
+
 * Mon Jan 30 2006 Hans de Goede  1.10-3
 - Summary and Description text fixes (bz 178568)
 



From fedora-extras-commits at redhat.com  Mon Feb 13 15:46:06 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Feb 2006 10:46:06 -0500
Subject: rpms/svgalib/devel svgalib.spec,1.6,1.7
Message-ID: <200602131546.k1DFkc0r009016@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	svgalib.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  1.9.24-2
- Bump release and rebuild for new gcc4.1 and glibc.
- add %{?dist} for consistency with my other packages



Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- svgalib.spec	5 Jan 2006 19:55:27 -0000	1.6
+++ svgalib.spec	13 Feb 2006 15:46:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		svgalib
 Version:	1.9.24
-Release:	1
+Release:	2%{?dist}
 Exclusivearch:	%{ix86} x86_64
 Summary:	Low-level fullscreen SVGA graphics library
 
@@ -125,7 +125,11 @@
 %{_mandir}/man3/*
 
 %changelog
-* Thu Jan  5 2008 Hans de Goede  1.9.24-1
+* Mon Feb 13 2006 Hans de Goede  1.9.24-2
+- Bump release and rebuild for new gcc4.1 and glibc.
+- add %%{?dist} for consistency with my other packages
+
+* Thu Jan  5 2006 Hans de Goede  1.9.24-1
 - New upstream version, drop merged patches.
 
 * Tue Aug 16 2005 Hans de Goede  1.9.21-5



From fedora-extras-commits at redhat.com  Mon Feb 13 15:48:36 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 10:48:36 -0500
Subject: rpms/bzr/FC-4 bzr.spec,1.1,1.2
Message-ID: <200602131549.k1DFn8r3009117@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	bzr.spec 
Log Message:
Added dist tag



Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-4/bzr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzr.spec	10 Feb 2006 19:00:25 -0000	1.1
+++ bzr.spec	13 Feb 2006 15:48:36 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           bzr
 Version:        0.7
-Release:        1
+Release:        2%{dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
@@ -102,6 +102,9 @@
 %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  0.7-2
+- Add dist tag
+
 * Fri Feb 10 2006 Shahms E. King  0.7-1
 - Update to 0.7
 



From fedora-extras-commits at redhat.com  Mon Feb 13 15:48:42 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 10:48:42 -0500
Subject: rpms/bzr/devel bzr.spec,1.1,1.2
Message-ID: <200602131549.k1DFnEnX009120@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	bzr.spec 
Log Message:
Added dist tag



Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzr.spec	10 Feb 2006 19:00:25 -0000	1.1
+++ bzr.spec	13 Feb 2006 15:48:41 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           bzr
 Version:        0.7
-Release:        1
+Release:        2%{dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
@@ -102,6 +102,9 @@
 %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  0.7-2
+- Add dist tag
+
 * Fri Feb 10 2006 Shahms E. King  0.7-1
 - Update to 0.7
 



From fedora-extras-commits at redhat.com  Mon Feb 13 15:59:18 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 10:59:18 -0500
Subject: rpms/bzr/FC-4 bzr.spec,1.2,1.3
Message-ID: <200602131559.k1DFxp20009273@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	bzr.spec 
Log Message:
BuildRequires elementtree



Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-4/bzr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzr.spec	13 Feb 2006 15:48:36 -0000	1.2
+++ bzr.spec	13 Feb 2006 15:59:18 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           bzr
 Version:        0.7
-Release:        2%{dist}
+Release:        3%{dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-devel python-elementtree
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   python-elementtree
 
@@ -102,6 +102,9 @@
 %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  0.7-3
+- Add python-elementtree to BuildRequires
+
 * Mon Feb 13 2006 Shahms E. King  0.7-2
 - Add dist tag
 



From fedora-extras-commits at redhat.com  Mon Feb 13 15:59:24 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 10:59:24 -0500
Subject: rpms/bzr/devel bzr.spec,1.2,1.3
Message-ID: <200602131559.k1DFxuL2009276@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	bzr.spec 
Log Message:
BuildRequires elementtree



Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzr.spec	13 Feb 2006 15:48:41 -0000	1.2
+++ bzr.spec	13 Feb 2006 15:59:24 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           bzr
 Version:        0.7
-Release:        2%{dist}
+Release:        3%{dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python-devel python-elementtree
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   python-elementtree
 
@@ -102,6 +102,9 @@
 %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  0.7-3
+- Add python-elementtree to BuildRequires
+
 * Mon Feb 13 2006 Shahms E. King  0.7-2
 - Add dist tag
 



From fedora-extras-commits at redhat.com  Mon Feb 13 16:03:20 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 13 Feb 2006 11:03:20 -0500
Subject: rpms/byzanz/devel byzanz.spec,1.6,1.7
Message-ID: <200602131603.k1DG3tJE011209@cvs-int.fedora.redhat.com>

Author: jcollie

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

Modified Files:
	byzanz.spec 
Log Message:
Build without %{_smp_mflags}.


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- byzanz.spec	13 Feb 2006 13:55:34 -0000	1.6
+++ byzanz.spec	13 Feb 2006 16:03:20 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
 Version: 0.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -28,7 +28,7 @@
 
 %build
 %configure
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf %{buildroot}
@@ -87,6 +87,9 @@
 %{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png
 
 %changelog
+* Mon Feb 13 2006 Jeffrey C. Ollie  - 0.1.0-5
+- Previous build failed, try without %%{_smp_mflags}.
+
 * Mon Feb 13 2006 Jeffrey C. Ollie  - 0.1.0-4
 - Bump release again.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 16:15:29 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Feb 2006 11:15:29 -0500
Subject: rpms/lyx/devel .cvsignore, 1.6, 1.7 lyx.spec, 1.18, 1.19 sources,
	1.7, 1.8
Message-ID: <200602131616.k1DGGOkC011474@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Mon Feb 13 2006 Rex Dieter  1.4.0-0.5.pre5
- 1.4.0pre5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Jan 2006 13:22:30 -0000	1.6
+++ .cvsignore	13 Feb 2006 16:15:28 -0000	1.7
@@ -1 +1 @@
-lyx-1.4.0pre4.tar.bz2
+lyx-1.4.0pre5.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lyx.spec	31 Jan 2006 13:22:30 -0000	1.18
+++ lyx.spec	13 Feb 2006 16:15:28 -0000	1.19
@@ -1,10 +1,10 @@
 
-%define beta pre4
+%define beta pre5
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.4.%{beta}%{?dist}
+Release: 0.5.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -198,6 +198,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Rex Dieter  1.4.0-0.5.pre5
+- 1.4.0pre5
+
 * Tue Jan 31 2006 Rex Dieter  1.4.0-0.2.pre4
 - 1.4.0pre4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Jan 2006 13:22:30 -0000	1.7
+++ sources	13 Feb 2006 16:15:28 -0000	1.8
@@ -1 +1 @@
-dbf4af105ce244dbe2b931cb27b4a5c9  lyx-1.4.0pre4.tar.bz2
+dd137748afafc7e79cd76056882d5f05  lyx-1.4.0pre5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Feb 13 16:22:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 11:22:17 -0500
Subject: rpms/perl-UNIVERSAL-can - New directory
Message-ID: <200602131622.k1DGMJKj011595@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-can
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11587/perl-UNIVERSAL-can

Log Message:
Directory /cvs/extras/rpms/perl-UNIVERSAL-can added to the repository




From fedora-extras-commits at redhat.com  Mon Feb 13 16:22:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 11:22:23 -0500
Subject: rpms/perl-UNIVERSAL-can/devel - New directory
Message-ID: <200602131622.k1DGMPK9011610@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-can/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11587/perl-UNIVERSAL-can/devel

Log Message:
Directory /cvs/extras/rpms/perl-UNIVERSAL-can/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Feb 13 16:23:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 11:23:03 -0500
Subject: rpms/perl-UNIVERSAL-can Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602131623.k1DGN5dr011644@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-can
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11632

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-UNIVERSAL-can


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 13 16:23:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 11:23:10 -0500
Subject: rpms/perl-UNIVERSAL-can/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200602131623.k1DGNCDN011664@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-can/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11632/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-UNIVERSAL-can


--- NEW 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 Feb 13 16:24:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 11:24:02 -0500
Subject: rpms/perl-UNIVERSAL-can import.log,1.1,1.2
Message-ID: <200602131624.k1DGOZHS011781@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-can
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11714

Modified Files:
	import.log 
Log Message:
auto-import perl-UNIVERSAL-can-1.11-1 on branch devel from perl-UNIVERSAL-can-1.11-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-can/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Feb 2006 16:23:03 -0000	1.1
+++ import.log	13 Feb 2006 16:24:02 -0000	1.2
@@ -0,0 +1 @@
+perl-UNIVERSAL-can-1_11-1:HEAD:perl-UNIVERSAL-can-1.11-1.src.rpm:1139847831



From fedora-extras-commits at redhat.com  Mon Feb 13 16:24:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 11:24:09 -0500
Subject: rpms/perl-UNIVERSAL-can/devel perl-UNIVERSAL-can.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602131624.k1DGOghQ011783@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-can/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11714/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-UNIVERSAL-can.spec 
Log Message:
auto-import perl-UNIVERSAL-can-1.11-1 on branch devel from perl-UNIVERSAL-can-1.11-1.src.rpm


--- NEW FILE perl-UNIVERSAL-can.spec ---
Name:           perl-UNIVERSAL-can
Version:        1.11
Release:        1%{?dist}
Summary:        Hack around people calling UNIVERSAL::can() as a function

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/UNIVERSAL-can/
Source0:        http://www.cpan.org/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Warn) >= 0.08
BuildRequires:  perl(Test::Simple) >= 0.60
BuildRequires:  perl(Test::Pod) >= 1.14
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The UNIVERSAL class provides a few default methods so that all objects
can use them. Object orientation allows programmers to override these
methods in subclasses to provide more specific and appropriate behavior.

Some authors call methods in the UNIVERSAL class on potential invocants
as functions, bypassing any possible overriding. This is wrong and you
should not do it. Unfortunately, not everyone heeds this warning and
their bad code can break your good code.


%prep
%setup -q -n UNIVERSAL-can-%{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}/UNIVERSAL/
%{_mandir}/man3/*.3*


%changelog
* Fri Feb 10 2006 Jose Pedro Oliveira  - 1.11-1
- Update to 1.11.
- No longer build requires perl(Test::Exception).

* Thu Feb  9 2006 Jose Pedro Oliveira  - 1.03-2
- Missing build requirement: perl(Test::Exception).

* Wed Feb  8 2006 Jose Pedro Oliveira  - 1.03-1
- Update to 1.03.

* Tue Dec 27 2005 Jose Pedro Oliveira  - 1.01-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-can/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Feb 2006 16:23:10 -0000	1.1
+++ .cvsignore	13 Feb 2006 16:24:09 -0000	1.2
@@ -0,0 +1 @@
+UNIVERSAL-can-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-can/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Feb 2006 16:23:10 -0000	1.1
+++ sources	13 Feb 2006 16:24:09 -0000	1.2
@@ -0,0 +1 @@
+a11167ca16c6d9767bab1ee41332f096  UNIVERSAL-can-1.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 16:28:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 11:28:31 -0500
Subject: owners owners.list,1.634,1.635
Message-ID: <200602131629.k1DGT7JX011859@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	owners.list 
Log Message:
New package: perl-UNIVERSAL-can (#180532)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -r1.634 -r1.635
--- owners.list	13 Feb 2006 15:41:42 -0000	1.634
+++ owners.list	13 Feb 2006 16:28:31 -0000	1.635
@@ -996,6 +996,7 @@
 Fedora Extras|perl-Unicode-Map|Perl module for mapping charsets from and to utf16 unicode|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-UNIVERSAL-can|Hack around people calling UNIVERSAL::can() as a function|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-exports|Lightweight, universal exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-isa|Hack around module authors using UNIVERSAL::isa as a function|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Feb 13 16:35:07 2006
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 13 Feb 2006 11:35:07 -0500
Subject: rpms/graphviz/devel graphviz.spec,1.22,1.23
Message-ID: <200602131635.k1DGZdW2011944@cvs-int.fedora.redhat.com>

Author: oliver

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

Modified Files:
	graphviz.spec 
Log Message:
* BR: ruby-devel


Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- graphviz.spec	21 Nov 2005 08:29:21 -0000	1.22
+++ graphviz.spec	13 Feb 2006 16:35:07 -0000	1.23
@@ -4,7 +4,7 @@
 Name:				graphviz
 
 Version:			2.6
-Release:			3%{?dist}
+Release:			4%{?dist}
 
 Group:				Applications/Multimedia
 License:			CPL
@@ -21,6 +21,7 @@
 BuildRequires:		fontconfig-devel libtool-ltdl-devel
 BuildRequires:		libXaw-devel libSM-devel libICE-devel libXpm-devel
 BuildRequires:		libXt-devel libXmu-devel libXext-devel libX11-devel
+BuildRequires:		ruby-devel
 Requires(post):		%{_bindir}/dot
 Requires(postun):	%{_bindir}/dot
 Requires:			urw-fonts
@@ -139,6 +140,9 @@
 %{_bindir}/dot -c
 
 %changelog
+* Mon Feb 13 2006 Oliver Falk 		- 2.6-4
+- BR: ruby-devel
+
 * Mon Nov 21 2005 Oliver Falk 		- 2.6-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 16:37:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Feb 2006 11:37:54 -0500
Subject: rpms/libgda/devel libgda-1.9.100-syslibs.patch, NONE,
	1.1 libgda.spec, 1.9, 1.10
Message-ID: <200602131638.k1DGcQ34012174@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	libgda.spec 
Added Files:
	libgda-1.9.100-syslibs.patch 
Log Message:
libgda use system sqlite WIP

libgda-1.9.100-syslibs.patch:

--- NEW FILE libgda-1.9.100-syslibs.patch ---
--- libgda-1.9.100/providers/sqlite/Makefile.am~	2006-02-13 17:31:19.000000000 +0100
+++ libgda-1.9.100/providers/sqlite/Makefile.am	2006-02-13 17:32:21.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = sqlite-src
+SUBDIRS = 
 
 providerdir=$(libdir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/providers
 provider_LTLIBRARIES = libgda-sqlite.la
@@ -27,7 +27,6 @@
 libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version
 libgda_sqlite_la_LIBADD = \
 	$(LIBGDA_LIBS) \
-	$(top_builddir)/libgda/libgda-3.la \
-	$(top_builddir)/providers/sqlite/sqlite-src/libsqlite.la 
+	$(top_builddir)/libgda/libgda-3.la -lsqlite3
 
 EXTRA_DIST = $(config_DATA)


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgda.spec	17 Jan 2006 08:19:39 -0000	1.9
+++ libgda.spec	13 Feb 2006 16:37:53 -0000	1.10
@@ -47,6 +47,7 @@
 BuildRequires:    libxslt-devel >= 1.0.9
 BuildRequires:    libxml2-devel ncurses-devel scrollkeeper groff readline-devel
 BuildRequires:    db4-devel gtk-doc mono-devel gtk-sharp2 gtk-sharp2-gapi
+BuildRequires:    sqlite-devel
 
 %if %{FREETDS}
 BuildRequires:    freetds-devel
@@ -74,6 +75,7 @@
 
 Patch0: libgda-1.9.100-configure.patch
 Patch1: libgda-1.9.100-sharp.patch
+Patch2: libgda-1.9.100-syslibs.patch
 
 %description
 libgda is a library that eases the task of writing
@@ -195,8 +197,10 @@
 
 %prep
 %setup -q
+rm -fr providers/sqlite/sqlite-src
 %patch0 -p1 -b .configure
 %patch1 -p1 -b .sharp
+%patch2 -p1 -b .syslibs
 
 %build
 aclocal



From fedora-extras-commits at redhat.com  Mon Feb 13 17:26:38 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:26:38 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.15, 
	1.16
Message-ID: <200602131727.k1DHREnw014371@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-serv14349

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 0.13-8
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- contact-lookup-applet.spec	28 Jan 2006 14:55:03 -0000	1.15
+++ contact-lookup-applet.spec	13 Feb 2006 17:26:38 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 0.13-8
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 28 2006 Brian Pepple  - 0.13-7
 - Bump.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:29:47 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:29:47 -0500
Subject: rpms/SDL_mixer/devel SDL_mixer.spec,1.11,1.12
Message-ID: <200602131730.k1DHUJtk014500@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	SDL_mixer.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 1.2.6-6
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/devel/SDL_mixer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SDL_mixer.spec	17 Nov 2005 04:59:06 -0000	1.11
+++ SDL_mixer.spec	13 Feb 2006 17:29:47 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 1.2.6-6
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Nov 16 2005 Brian Pepple  - 1.2.6-5
 - Add requires for timidity++ to fix bug #173393.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:31:31 -0500
Subject: rpms/SDL_image/devel SDL_image.spec,1.6,1.7
Message-ID: <200602131732.k1DHW3iW014722@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	SDL_image.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 1.2.4-5
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: SDL_image.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/devel/SDL_image.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SDL_image.spec	27 Sep 2005 21:25:12 -0000	1.6
+++ SDL_image.spec	13 Feb 2006 17:31:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		SDL_image
 Version:	1.2.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Image loading library for SDL
 
 Group:		System Environment/Libraries
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 1.2.4-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Sep 27 2005 Brian Pepple  - 1.2.4-4
 - Bump release so it upgrades from FC4.
 - General spec formatting cleanup.



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:57 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:31:57 -0500
Subject: rpms/mail-notification/devel mail-notification.spec,1.16,1.17
Message-ID: <200602131732.k1DHWTop014812@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14559/mail-notification/devel

Modified Files:
	mail-notification.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mail-notification.spec	30 Jan 2006 10:58:28 -0000	1.16
+++ mail-notification.spec	13 Feb 2006 17:31:56 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 30 2006 Thorsten Leemhuis  2.0-10
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:27 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:31:27 -0500
Subject: rpms/enigma/devel enigma.spec,1.11,1.12
Message-ID: <200602131732.k1DHWUfk014815@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	enigma.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: enigma.spec
===================================================================
RCS file: /cvs/extras/rpms/enigma/devel/enigma.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- enigma.spec	23 Jan 2006 09:42:03 -0000	1.11
+++ enigma.spec	13 Feb 2006 17:31:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           enigma
 Version:        0.92
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
@@ -65,6 +65,9 @@
 %{_datadir}/applications/*enigma.desktop
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 23 2006 Adrian Reber  - 0.92-2
 - Added patch to build with gcc 4.1
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:33 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:31:33 -0500
Subject: rpms/ghex/devel ghex.spec,1.9,1.10
Message-ID: <200602131732.k1DHWakb014822@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	ghex.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: ghex.spec
===================================================================
RCS file: /cvs/extras/rpms/ghex/devel/ghex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ghex.spec	6 Apr 2005 22:11:38 -0000	1.9
+++ ghex.spec	13 Feb 2006 17:31:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ghex
 Version:        2.8.1
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Binary editor for GNOME
 
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:32:02 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:32:02 -0500
Subject: rpms/notemeister/devel notemeister.spec,1.7,1.8
Message-ID: <200602131732.k1DHWZCw014818@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	notemeister.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: notemeister.spec
===================================================================
RCS file: /cvs/extras/rpms/notemeister/devel/notemeister.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- notemeister.spec	5 May 2005 15:43:36 -0000	1.7
+++ notemeister.spec	13 Feb 2006 17:32:02 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           notemeister
 Version:        0.1.7
-Release:        7
+Release:        8%{?dist}
 Summary:        Small, simple note organizer made for the GNOME2 desktop
 
 Group:          Applications/Productivity
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Thu May 05 2005 Thorsten Leemhuis  0.1.7-7
 - Devel rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:32:09 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:32:09 -0500
Subject: rpms/python-crypto/devel python-crypto.spec,1.9,1.10
Message-ID: <200602131732.k1DHWfV9014829@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	python-crypto.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: python-crypto.spec
===================================================================
RCS file: /cvs/extras/rpms/python-crypto/devel/python-crypto.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-crypto.spec	17 Aug 2005 19:10:48 -0000	1.9
+++ python-crypto.spec	13 Feb 2006 17:32:08 -0000	1.10
@@ -4,7 +4,7 @@
 Summary:	Cryptography library for Python
 Name:		python-crypto
 Version:	2.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Python License (CNRI Python License)
 Group:		Development/Libraries
 URL:		http://www.amk.ca/python/code/crypto.html
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Wed Aug 17 2005 Thorsten Leemhuis  - 0:2.0.1-1
 - Update to 2.0.1
 - Use Dist



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:39 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:31:39 -0500
Subject: rpms/gsynaptics/devel gsynaptics.spec,1.3,1.4
Message-ID: <200602131732.k1DHWfJk014832@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	gsynaptics.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: gsynaptics.spec
===================================================================
RCS file: /cvs/extras/rpms/gsynaptics/devel/gsynaptics.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gsynaptics.spec	13 Nov 2005 15:49:18 -0000	1.3
+++ gsynaptics.spec	13 Feb 2006 17:31:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gsynaptics
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Settings tool for Synaptics touchpad driver
 
 Group:          Applications/System
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Sun Nov 13 2005 Thorsten Leemhuis  - 0.9.5-1
 - Update to 0.9.5
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:32:14 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:32:14 -0500
Subject: rpms/revelation/devel revelation.spec,1.15,1.16
Message-ID: <200602131732.k1DHWlxp014835@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	revelation.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- revelation.spec	6 Feb 2006 19:34:22 -0000	1.15
+++ revelation.spec	13 Feb 2006 17:32:14 -0000	1.16
@@ -4,7 +4,7 @@
 Summary:	Password manager for GNOME 2
 Name:		revelation
 Version:	0.4.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Source0:	ftp://oss.codepoet.no/revelation/revelation-0.4.7.tar.bz2
@@ -106,6 +106,9 @@
 %{_libexecdir}/revelation-applet
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Mon Feb 06 2006 Thorsten Leemhuis  0.4.7-1
 - update to 0.4.7
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:16 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:31:16 -0500
Subject: rpms/alsa-tools/devel alsa-tools.spec,1.9,1.10
Message-ID: <200602131732.k1DHWm1X014841@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14559/alsa-tools/devel

Modified Files:
	alsa-tools.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alsa-tools.spec	6 Dec 2005 18:55:02 -0000	1.9
+++ alsa-tools.spec	13 Feb 2006 17:31:16 -0000	1.10
@@ -5,7 +5,7 @@
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
 Version: 	1.0.10
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -151,6 +151,9 @@
 %endif # ?_with_firmware
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Tue Dec 06 2005 Thorsten Leemhuis  - 1.0.10-1
 - Update to 1.0.10
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:45 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:31:45 -0500
Subject: rpms/gweled/devel gweled.spec,1.12,1.13
Message-ID: <200602131732.k1DHWlZg014838@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	gweled.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gweled.spec	29 Jan 2006 17:10:58 -0000	1.12
+++ gweled.spec	13 Feb 2006 17:31:45 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gweled
 Version:        0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Swapping gem game
 
@@ -66,6 +66,9 @@
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Sun Jan 29 2006 Thorsten Leemhuis  - 0.7-3
 - Fix build in devel (mv behaviour changed)
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:32:20 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:32:20 -0500
Subject: rpms/tiobench/devel tiobench.spec,1.1,1.2
Message-ID: <200602131732.k1DHWq0h014844@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	tiobench.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: tiobench.spec
===================================================================
RCS file: /cvs/extras/rpms/tiobench/devel/tiobench.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tiobench.spec	14 Oct 2005 16:00:20 -0000	1.1
+++ tiobench.spec	13 Feb 2006 17:32:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tiobench
 Version:        0.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Threaded I/O benchmark
 
 Group:          Applications/System
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Fri Oct 14 2005 Thorsten Leemhuis  - 0.3.3-2
 - Use dist
 - Use uncompressed man-pages



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:22 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:31:22 -0500
Subject: rpms/brightside/devel brightside.spec,1.10,1.11
Message-ID: <200602131732.k1DHWsdi014848@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	brightside.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- brightside.spec	17 Aug 2005 17:25:11 -0000	1.10
+++ brightside.spec	13 Feb 2006 17:31:21 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           brightside
 Version:        1.4.0
-Release: 	9
+Release: 	10%{?dist}
 
 Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Wed Aug 17 2005 Thorsten Leemhuis  - 1.4.0-9
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:31:51 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 13 Feb 2006 12:31:51 -0500
Subject: rpms/gwget/devel gwget.spec,1.10,1.11
Message-ID: <200602131732.k1DHWrje014847@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	gwget.spec 
Log Message:
increase release for Fedora Extras 5 rebuild


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gwget.spec	1 Feb 2006 10:39:23 -0000	1.10
+++ gwget.spec	13 Feb 2006 17:31:50 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.97
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
 * Wed Feb 01 2006 Thorsten Leemhuis  0.97-1
 - Update to 0.97
 - Build with epiphany 1.9/2.0



From fedora-extras-commits at redhat.com  Mon Feb 13 17:33:48 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:33:48 -0500
Subject: rpms/SDL_net/devel SDL_net.spec,1.4,1.5
Message-ID: <200602131734.k1DHYKCk014958@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	SDL_net.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 1.2.5-8
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: SDL_net.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_net/devel/SDL_net.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SDL_net.spec	27 Sep 2005 21:55:24 -0000	1.4
+++ SDL_net.spec	13 Feb 2006 17:33:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		SDL_net
 Version:	1.2.5
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	SDL portable network library
 
 Group:		System Environment/Libraries
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 1.2.5-8
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Sep 27 2005 Brian Pepple  - 1.2.5-7
 - General spec formatting cleanup.
 - Add dist tag.



From fedora-extras-commits at redhat.com  Mon Feb 13 17:33:56 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 13 Feb 2006 12:33:56 -0500
Subject: rpms/nmh/devel nmh.spec,1.12,1.13
Message-ID: <200602131734.k1DHYSV3014969@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	nmh.spec 
Log Message:
Rebuild for Fedora Extras 5.



Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nmh.spec	16 Dec 2005 21:34:46 -0000	1.12
+++ nmh.spec	13 Feb 2006 17:33:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        15.fc5
+Release:        16.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -71,6 +71,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Mon Feb 13 2006 Josh Bressers  0:1.1-16.fc5
+- Rebuild for Fedora Extras 5.
+
 * Fri Dec 16 2005 Josh Bressers  0:1.1-15.fc5
 - Add the -fno-builtin-strcasecmp cflag.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:34:36 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Feb 2006 12:34:36 -0500
Subject: rpms/atlas/devel atlas.spec,1.5,1.6
Message-ID: <200602131735.k1DHZ8ox015145@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	atlas.spec 
Log Message:
Rebuild for FE5. Fix executable stack bug.



Index: atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- atlas.spec	19 Dec 2005 18:10:30 -0000	1.5
+++ atlas.spec	13 Feb 2006 17:34:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           atlas
 Version:        3.6.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -242,7 +242,7 @@
 
   cat ${BUILD_DATA_DIR}/build.uu | uudecode | zcat - | \
 	sed -e s/g77/gfortran/ -e s/-DAdd__/-DAdd_/ | debian/ab topdir=`pwd` \
-	carch=$BUILD_DIR debug= | bash -x -e
+	carch=$BUILD_DIR fpic="-Wa,--noexecstack" debug= | bash -x -e
   mv lib/$BUILD_DIR/liblapack.a lib/$BUILD_DIR/liblapack_atlas.a
 
   # Create replacement for BLAS and LAPACK Libraries
@@ -289,7 +289,7 @@
 
   cat ${BUILD_DATA_DIR}/build.uu | uudecode | zcat - | \
 	sed -e s/g77/gfortran/ -e s/-DAdd__/-DAdd_/ | debian/ab topdir=`pwd` \
-	carch=$BUILD_DIR fpic="-fPIC" debug= | bash -x -e
+	carch=$BUILD_DIR fpic="-Wa,--noexecstack -fPIC" debug= | bash -x -e
   mv lib/$BUILD_DIR/liblapack.a lib/$BUILD_DIR/liblapack_atlas.a
 
   mkdir tmp
@@ -537,6 +537,11 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Quentin Spencer  3.6.0-10
+- Rebuild for Fedora Extras 5.
+- Add --noexecstack to compilation of assembly kernels. These were
+  previously marked executable, which caused problems with selinux.
+
 * Mon Dec 19 2005 Quentin Spencer  3.6.0-9
 - Rebuild for gcc 4.1.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:35:30 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:35:30 -0500
Subject: rpms/SDL_ttf/devel SDL_ttf.spec,1.9,1.10
Message-ID: <200602131736.k1DHa2ZV015414@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	SDL_ttf.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 2.0.7-4
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: SDL_ttf.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SDL_ttf.spec	14 Dec 2005 19:21:27 -0000	1.9
+++ SDL_ttf.spec	13 Feb 2006 17:35:30 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		SDL_ttf
 Version:	2.0.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Simple DirectMedia Layer TrueType Font library
 
 Group:		System Environment/Libraries
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 2.0.7-4
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 14 2005 Brian Pepple  - 2.0.7-3
 - Add patch for Bug #171020.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:37:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:37:14 -0500
Subject: rpms/freeciv/devel freeciv.spec,1.18,1.19
Message-ID: <200602131737.k1DHbl0r015495@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	freeciv.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 2.0.7-5
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- freeciv.spec	4 Dec 2005 15:18:39 -0000	1.18
+++ freeciv.spec	13 Feb 2006 17:37:14 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           freeciv
 Version:        2.0.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
 Group:          Amusements/Games
@@ -90,6 +90,9 @@
 %{_mandir}/man6/civclient.6.gz
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 2.0.7-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Dec  4 2005 Brian Pepple  - 2.0.7-4
 - Rebuild for new bind.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:38:56 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:38:56 -0500
Subject: rpms/ipython/FC-3 ipython.spec,1.7,1.8
Message-ID: <200602131739.k1DHdS41015640@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	ipython.spec 
Log Message:
Rebuild for FC-5 (other specs updated, but not rebuilt)



Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ipython.spec	30 Jan 2006 23:46:58 -0000	1.7
+++ ipython.spec	13 Feb 2006 17:38:56 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           ipython
 Version:        0.7.1.fix1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  0.7.1.fix1-2
+- Rebuild for FC-5
+
 * Mon Jan 30 2006 Shahms E. King  0.7.1.fix1-1
 - New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:39:02 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:39:02 -0500
Subject: rpms/ipython/FC-4 ipython.spec,1.9,1.10
Message-ID: <200602131739.k1DHdYTH015644@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	ipython.spec 
Log Message:
Rebuild for FC-5 (other specs updated, but not rebuilt)



Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/ipython.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ipython.spec	30 Jan 2006 23:47:03 -0000	1.9
+++ ipython.spec	13 Feb 2006 17:39:02 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           ipython
 Version:        0.7.1.fix1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  0.7.1.fix1-2
+- Rebuild for FC-5
+
 * Mon Jan 30 2006 Shahms E. King  0.7.1.fix1-1
 - New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:39:08 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:39:08 -0500
Subject: rpms/ipython/devel ipython.spec,1.9,1.10
Message-ID: <200602131739.k1DHdeJr015647@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	ipython.spec 
Log Message:
Rebuild for FC-5 (other specs updated, but not rebuilt)



Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ipython.spec	30 Jan 2006 23:47:09 -0000	1.9
+++ ipython.spec	13 Feb 2006 17:39:07 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           ipython
 Version:        0.7.1.fix1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  0.7.1.fix1-2
+- Rebuild for FC-5
+
 * Mon Jan 30 2006 Shahms E. King  0.7.1.fix1-1
 - New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:39:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:39:14 -0500
Subject: rpms/loudmouth/devel loudmouth.spec,1.9,1.10
Message-ID: <200602131739.k1DHdldh015654@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 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 1.0.1-5
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: loudmouth.spec
===================================================================
RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- loudmouth.spec	27 Dec 2005 01:17:46 -0000	1.9
+++ loudmouth.spec	13 Feb 2006 17:39:14 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           loudmouth
 Version:        1.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Loudmouth is a Jabber programming library written in C
 
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 1.0.1-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 26 2005 Brian Pepple  - 1.0.1-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:40:10 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 13 Feb 2006 12:40:10 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.12,1.13
Message-ID: <200602131740.k1DHehPO015793@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	autotrace.spec 
Log Message:
* Mon Feb 13 2006 Roozbeh Pournader  - 0.31.1-12
- Rebuild for Fedora Extras 5



Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- autotrace.spec	28 Jan 2006 11:44:57 -0000	1.12
+++ autotrace.spec	13 Feb 2006 17:40:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Roozbeh Pournader  - 0.31.1-12
+- Rebuild for Fedora Extras 5
+
 * Sat Jan 28 2006 Roozbeh Pournader  - 0.31.1-11
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:40:59 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:40:59 -0500
Subject: rpms/gossip/devel gossip.spec,1.10,1.11
Message-ID: <200602131741.k1DHfVCF015891@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	gossip.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 0.9-9
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gossip.spec	27 Dec 2005 01:31:08 -0000	1.10
+++ gossip.spec	13 Feb 2006 17:40:59 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           gossip
 Version:        0.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 0.9-9
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 26 2005 Brian Pepple  - 0.9-8
 - Rebuild for new loudmouth.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:41:24 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 13 Feb 2006 12:41:24 -0500
Subject: rpms/kanatest/devel kanatest.spec,1.2,1.3
Message-ID: <200602131741.k1DHfuP2015957@cvs-int.fedora.redhat.com>

Author: robmv

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

Modified Files:
	kanatest.spec 
Log Message:
Rebuild for Fedora Extras 5



Index: kanatest.spec
===================================================================
RCS file: /cvs/extras/rpms/kanatest/devel/kanatest.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kanatest.spec	17 Oct 2005 12:25:51 -0000	1.2
+++ kanatest.spec	13 Feb 2006 17:41:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kanatest
 Version:        0.3.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Hiragana and Katakana drill tool
 
 Group:          Amusements/Games
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Robert Marcano  - 0.3.6-4
+- Rebuild for Fedora Extras 5
+
 * Fri May 20 2005 Robert Marcano  - 0.3.6-3
 - Added desktop-file-utils to BuildRequires
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:41:50 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Feb 2006 12:41:50 -0500
Subject: rpms/cln/devel cln.spec,1.17,1.18
Message-ID: <200602131742.k1DHgMV0016001@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	cln.spec 
Log Message:
Rebuild for FE5. Disable static libs. Fix bug.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cln.spec	30 Jan 2006 21:21:06 -0000	1.17
+++ cln.spec	13 Feb 2006 17:41:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -43,6 +43,7 @@
 %makeinstall
 mkdir -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-devel-%{version}
 mv ${RPM_BUILD_ROOT}%{_datadir}/dvi/cln.dvi ${RPM_BUILD_ROOT}%{_datadir}/html ${RPM_BUILD_ROOT}%{_docdir}/%{name}-devel-%{version}
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -67,7 +68,6 @@
 %files devel
 %defattr(-,root,root)
 %{_docdir}/%{name}-devel-%{version}
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/cln.pc
 %{_includedir}/cln/
@@ -75,10 +75,15 @@
 %{_mandir}/man1/cln-config.1*
 %{_bindir}/cln-config
 %{_datadir}/aclocal/cln.m4
+%exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
-%exclude %{_infodir}/dir
 
 %changelog
+* Mon Feb 13 2006 Quentin Spencer  1.1.11-4
+- Rebuild for Fedora Extras 5.
+- Remove /usr/share/info/dir after install.
+- Exclude static libs.
+
 * Mon Jan 16 2006 Quentin Spencer  1.1.11-3
 - Exclude /usr/share/info/dir from package (bug 178660).
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:43:20 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:43:20 -0500
Subject: rpms/python-durus/FC-3 .cvsignore, 1.5, 1.6 python-durus.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <200602131743.k1DHhqRB016130@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-durus/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16066/FC-3

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
update to new upstream version 3.2 and rebuild for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Nov 2005 20:15:44 -0000	1.5
+++ .cvsignore	13 Feb 2006 17:43:19 -0000	1.6
@@ -1 +1 @@
-Durus-3.1.tar.gz
+Durus-3.2.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/python-durus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-durus.spec	1 Nov 2005 20:15:44 -0000	1.4
+++ python-durus.spec	13 Feb 2006 17:43:19 -0000	1.5
@@ -3,7 +3,7 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        3.1
+Version:        3.2
 Release:        1%{?dist}
 Summary:        A Python Object Database
 
@@ -53,6 +53,10 @@
 %{_bindir}/durus
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  3.2-1
+- Update to upstream 3.2
+- Rebuild for FC5
+
 * Tue Nov 01 2005 Shahms E. King  3.1-1
 - Update to upstream 3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Nov 2005 20:15:44 -0000	1.5
+++ sources	13 Feb 2006 17:43:19 -0000	1.6
@@ -1 +1 @@
-f02bf4581012dbd0e145a59ebd5fd8b1  Durus-3.1.tar.gz
+f10d3eebfa01eeee8113b82930c13320  Durus-3.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 17:43:25 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:43:25 -0500
Subject: rpms/python-durus/FC-4 .cvsignore, 1.5, 1.6 python-durus.spec, 1.7, 
	1.8 sources, 1.5, 1.6
Message-ID: <200602131743.k1DHhw5J016138@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
update to new upstream version 3.2 and rebuild for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Nov 2005 20:15:50 -0000	1.5
+++ .cvsignore	13 Feb 2006 17:43:25 -0000	1.6
@@ -1 +1 @@
-Durus-3.1.tar.gz
+Durus-3.2.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/python-durus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-durus.spec	1 Nov 2005 20:15:50 -0000	1.7
+++ python-durus.spec	13 Feb 2006 17:43:25 -0000	1.8
@@ -3,7 +3,7 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        3.1
+Version:        3.2
 Release:        1%{?dist}
 Summary:        A Python Object Database
 
@@ -53,6 +53,10 @@
 %{_bindir}/durus
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  3.2-1
+- Update to upstream 3.2
+- Rebuild for FC5
+
 * Tue Nov 01 2005 Shahms E. King  3.1-1
 - Update to upstream 3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Nov 2005 20:15:50 -0000	1.5
+++ sources	13 Feb 2006 17:43:25 -0000	1.6
@@ -1 +1 @@
-f02bf4581012dbd0e145a59ebd5fd8b1  Durus-3.1.tar.gz
+f10d3eebfa01eeee8113b82930c13320  Durus-3.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 17:43:31 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:43:31 -0500
Subject: rpms/python-durus/devel .cvsignore, 1.5, 1.6 python-durus.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200602131744.k1DHi3x5016151@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-durus.spec sources 
Log Message:
update to new upstream version 3.2 and rebuild for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Nov 2005 20:15:56 -0000	1.5
+++ .cvsignore	13 Feb 2006 17:43:31 -0000	1.6
@@ -1 +1 @@
-Durus-3.1.tar.gz
+Durus-3.2.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/python-durus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-durus.spec	1 Nov 2005 20:15:56 -0000	1.7
+++ python-durus.spec	13 Feb 2006 17:43:31 -0000	1.8
@@ -3,7 +3,7 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        3.1
+Version:        3.2
 Release:        1%{?dist}
 Summary:        A Python Object Database
 
@@ -53,6 +53,10 @@
 %{_bindir}/durus
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  3.2-1
+- Update to upstream 3.2
+- Rebuild for FC5
+
 * Tue Nov 01 2005 Shahms E. King  3.1-1
 - Update to upstream 3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-durus/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Nov 2005 20:15:56 -0000	1.5
+++ sources	13 Feb 2006 17:43:31 -0000	1.6
@@ -1 +1 @@
-f02bf4581012dbd0e145a59ebd5fd8b1  Durus-3.1.tar.gz
+f10d3eebfa01eeee8113b82930c13320  Durus-3.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 17:45:27 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:45:27 -0500
Subject: rpms/gnome-blog/devel gnome-blog.spec,1.11,1.12
Message-ID: <200602131745.k1DHjxWU016357@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307

Modified Files:
	gnome-blog.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 0.8-12
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-blog.spec	7 Feb 2006 19:16:34 -0000	1.11
+++ gnome-blog.spec	13 Feb 2006 17:45:26 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:		gnome-blog
 Version:	0.8
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	GNOME panel object for posting blog entries
 
 Group:		Applications/Internet
@@ -94,6 +94,9 @@
 %ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 0.8-12
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Feb  7 2006 Brian Pepple  - 0.8-11
 - Remove Utility category from desktop file. (#179827)
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:46:08 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Feb 2006 12:46:08 -0500
Subject: rpms/cln/FC-4 cln.spec,1.12,1.13
Message-ID: <200602131746.k1DHke6e016468@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	cln.spec 
Log Message:
Disable static libs.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/cln.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cln.spec	31 Jan 2006 18:33:06 -0000	1.12
+++ cln.spec	13 Feb 2006 17:46:08 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -43,6 +43,7 @@
 %makeinstall
 mkdir -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-devel-%{version}
 mv ${RPM_BUILD_ROOT}%{_datadir}/dvi/cln.dvi ${RPM_BUILD_ROOT}%{_datadir}/html ${RPM_BUILD_ROOT}%{_docdir}/%{name}-devel-%{version}
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -67,7 +68,6 @@
 %files devel
 %defattr(-,root,root)
 %{_docdir}/%{name}-devel-%{version}
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/cln.pc
 %{_includedir}/cln/
@@ -75,10 +75,13 @@
 %{_mandir}/man1/cln-config.1*
 %{_bindir}/cln-config
 %{_datadir}/aclocal/cln.m4
+%exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
-%exclude %{_infodir}/dir
 
 %changelog
+* Tue Jan 31 2006 Quentin Spencer  1.1.11-3
+- Disable static libs.
+
 * Tue Jan 31 2006 Quentin Spencer  1.1.11-2
 - Exclude /usr/share/info/dir from package.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:47:08 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:47:08 -0500
Subject: rpms/gramps/devel gramps.spec,1.15,1.16
Message-ID: <200602131747.k1DHleYs016512@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	gramps.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 2.0.9-5
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gramps.spec	30 Jan 2006 21:37:02 -0000	1.15
+++ gramps.spec	13 Feb 2006 17:47:07 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 2.0.9-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 28 2006 Brian Pepple  - 2.0.9-4
 - Add require for shared-mime-info.
 - Remove mime.cache.



From fedora-extras-commits at redhat.com  Mon Feb 13 17:47:37 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:47:37 -0500
Subject: rpms/python-psyco/FC-3 python-psyco.spec,1.6,1.7
Message-ID: <200602131748.k1DHm92S016607@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16499/FC-3

Modified Files:
	python-psyco.spec 
Log Message:
Rebuild for FC5



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/FC-3/python-psyco.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-psyco.spec	11 Jan 2006 16:06:26 -0000	1.6
+++ python-psyco.spec	13 Feb 2006 17:47:36 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -55,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  1.5-4
+- Rebuild for FC5
+
 * Wed Jan 11 2006 Shahms E. King  1.5-3
 - Add a description and rebuild.  Ooops.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:47:42 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:47:42 -0500
Subject: rpms/python-psyco/FC-4 python-psyco.spec,1.7,1.8
Message-ID: <200602131748.k1DHmFGq016610@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-serv16499/FC-4

Modified Files:
	python-psyco.spec 
Log Message:
Rebuild for FC5



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/FC-4/python-psyco.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-psyco.spec	11 Jan 2006 16:06:56 -0000	1.7
+++ python-psyco.spec	13 Feb 2006 17:47:42 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -55,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  1.5-4
+- Rebuild for FC5
+
 * Wed Jan 11 2006 Shahms E. King  1.5-3
 - Add a description and rebuild.  Ooops.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:47:48 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:47:48 -0500
Subject: rpms/python-psyco/devel python-psyco.spec,1.7,1.8
Message-ID: <200602131748.k1DHmKIr016613@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-psyco.spec 
Log Message:
Rebuild for FC5



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/devel/python-psyco.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-psyco.spec	11 Jan 2006 16:07:03 -0000	1.7
+++ python-psyco.spec	13 Feb 2006 17:47:48 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -55,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  1.5-4
+- Rebuild for FC5
+
 * Wed Jan 11 2006 Shahms E. King  1.5-3
 - Add a description and rebuild.  Ooops.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:47:54 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 13 Feb 2006 12:47:54 -0500
Subject: rpms/jed/devel jed.spec,1.7,1.8
Message-ID: <200602131748.k1DHmQRU016618@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	jed.spec 
Log Message:
bump for rebuild



Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jed.spec	30 Nov 2005 21:54:31 -0000	1.7
+++ jed.spec	13 Feb 2006 17:47:54 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
 Version: 0.99.17
-Release: 0.pre135.1
+Release: 0.pre135.2
 License: GPL
 Group: Applications/Editors
 Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/pre-0.99-17/jed-B0.99-17.135.tar.bz2
@@ -68,6 +68,9 @@
 %{_datadir}/jed
 
 %changelog
+* Mon Feb 13 2006 Bill Nottingham  0.99.17-0.pre135.2
+- bump for rebuild
+
 * Mon May  9 2005 Bill Nottingham  0.99.16-10
 - don't forcibly strip binary, fixes debuginfo generation
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:49:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:49:00 -0500
Subject: rpms/liferea/devel liferea.spec,1.30,1.31
Message-ID: <200602131749.k1DHnXtR016709@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	liferea.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 1.0.4-3
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- liferea.spec	11 Feb 2006 15:00:49 -0000	1.30
+++ liferea.spec	13 Feb 2006 17:49:00 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 1.0.4-3
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 10 2006 Brian Pepple  - 1.0.4-2
 - Update to 1.0.4.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:50:33 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:50:33 -0500
Subject: rpms/meld/devel meld.spec,1.13,1.14
Message-ID: <200602131751.k1DHp5nf016834@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	meld.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 1.1.3-3
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- meld.spec	5 Feb 2006 21:31:07 -0000	1.13
+++ meld.spec	13 Feb 2006 17:50:33 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:             meld
 Version:          1.1.3
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Visual diff and merge tool
 
 Group:            Development/Tools
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 1.1.3-3
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Brian Pepple  - 1.1.3-2
 - Update to 1.1.3.
 - Update scrollkeeper scriptlet.



From fedora-extras-commits at redhat.com  Mon Feb 13 17:50:29 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Feb 2006 12:50:29 -0500
Subject: rpms/ginac/devel ginac.spec,1.6,1.7
Message-ID: <200602131751.k1DHp2DZ016831@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	ginac.spec 
Log Message:
Rebuild for Fedora Extras 5.


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ginac.spec	2 Feb 2006 21:37:26 -0000	1.6
+++ ginac.spec	13 Feb 2006 17:50:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ginac
 Version:        1.3.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
@@ -106,6 +106,9 @@
 %{_mandir}/man?/viewgar.1*
 
 %changelog
+* Mon Feb 13 2006 Quentin Spencer  1.3.3-4
+- Rebuild for Fedora Extras 5.
+
 * Thu Feb  2 2006 Quentin Spencer  1.3.3-3
 - Patch so it builds on gcc 4.1.
 - Disable static libs from build and enable parallel build.



From fedora-extras-commits at redhat.com  Mon Feb 13 17:50:34 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 13 Feb 2006 12:50:34 -0500
Subject: rpms/shorewall/devel .cvsignore, 1.11, 1.12 shorewall.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200602131751.k1DHp6D5016841@cvs-int.fedora.redhat.com>

Author: robmv

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

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Rebuild for Fedora Extras 5, Update to upstream 3.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Jan 2006 18:10:23 -0000	1.11
+++ .cvsignore	13 Feb 2006 17:50:34 -0000	1.12
@@ -1 +1 @@
-shorewall-3.0.4.tar.bz2
+shorewall-3.0.5.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- shorewall.spec	12 Jan 2006 18:10:23 -0000	1.17
+++ shorewall.spec	13 Feb 2006 17:50:34 -0000	1.18
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.0.4
+Version: 3.0.5
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -80,6 +80,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Mon Feb 13 2006 Robert Marcano  - 3.0.5-1
+- Rebuild for Fedora Extras 5, Update to upstream 3.0.5
+
 * Thu Jan 12 2006 Robert Marcano  - 3.0.4-1
 - Update to upstream 3.0.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Jan 2006 18:10:23 -0000	1.11
+++ sources	13 Feb 2006 17:50:34 -0000	1.12
@@ -1 +1 @@
-2745e8e5c2143c3d9f5836b964c67721  shorewall-3.0.4.tar.bz2
+a732c8589c4bbf6a6e83a72ff6a8bf1e  shorewall-3.0.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Feb 13 17:51:13 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 13 Feb 2006 12:51:13 -0500
Subject: rpms/Maelstrom/devel Maelstrom.spec,1.4,1.5
Message-ID: <200602131751.k1DHpjcb016979@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	Maelstrom.spec 
Log Message:
bump for rebuild


Index: Maelstrom.spec
===================================================================
RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Maelstrom.spec	26 May 2005 17:48:25 -0000	1.4
+++ Maelstrom.spec	13 Feb 2006 17:51:13 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A space combat game.
 Name: Maelstrom
 Version: 3.0.6
-Release: 8
+Release: 9
 License: LGPL
 Group: Amusements/Games
 Source0:   Maelstrom-%{version}.tar.gz
@@ -23,7 +23,7 @@
 %setup -q
 %patch0 -p1 -b .setgid
 %patch1 -p1 -b .gcc34
-%patch2 -p1 -b .64bit
+#%patch2 -p1 -b .64bit
 
 %build
 touch Makefile.in
@@ -75,6 +75,9 @@
 %{_datadir}/icons
 
 %changelog
+* Mon Feb 13 2006 Bill Nottingham  3.0.6-9
+- rebuild
+
 * Thu May 26 2005 Bill Nottingham 
 - fix x86_64 build
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:51:45 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:51:45 -0500
Subject: rpms/nautilus-image-converter/devel nautilus-image-converter.spec,
	1.3, 1.4
Message-ID: <200602131752.k1DHqHJI016995@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/nautilus-image-converter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16975

Modified Files:
	nautilus-image-converter.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 0.0.5-3
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: nautilus-image-converter.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-image-converter/devel/nautilus-image-converter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nautilus-image-converter.spec	17 Oct 2005 19:13:39 -0000	1.3
+++ nautilus-image-converter.spec	13 Feb 2006 17:51:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           nautilus-image-converter
 Version:        0.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nautilus extension to mass resize images
 
 Group:          User Interface/Desktops
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 0.0.5-3
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Oct 17 2005 Brian Pepple  - 0.0.5-2
 - Update to 0.0.5.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:52:54 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Mon, 13 Feb 2006 12:52:54 -0500
Subject: rpms/shorewall/FC-4 .cvsignore, 1.5, 1.6 shorewall.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200602131753.k1DHrRPM017116@cvs-int.fedora.redhat.com>

Author: robmv

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

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Feb 2006 18:28:13 -0000	1.5
+++ .cvsignore	13 Feb 2006 17:52:54 -0000	1.6
@@ -1 +1 @@
-shorewall-3.0.4.tar.bz2
+shorewall-3.0.5.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- shorewall.spec	8 Feb 2006 18:28:13 -0000	1.12
+++ shorewall.spec	13 Feb 2006 17:52:54 -0000	1.13
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.0.4
+Version: 3.0.5
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -80,6 +80,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Mon Feb 13 2006 Robert Marcano  - 3.0.5-1
+- Rebuild for Fedora Extras 5, Update to upstream 3.0.5
+
 * Thu Jan 12 2006 Robert Marcano  - 3.0.4-1
 - Update to upstream 3.0.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Feb 2006 18:28:13 -0000	1.5
+++ sources	13 Feb 2006 17:52:54 -0000	1.6
@@ -1 +1 @@
-2745e8e5c2143c3d9f5836b964c67721  shorewall-3.0.4.tar.bz2
+a732c8589c4bbf6a6e83a72ff6a8bf1e  shorewall-3.0.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Feb 13 17:53:04 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:53:04 -0500
Subject: rpms/python-protocols/devel python-protocols.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200602131753.k1DHraqu017123@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-protocols.spec sources 
Log Message:
Rebuild for FC5 and BuildRequires setuptools



Index: python-protocols.spec
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/python-protocols.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-protocols.spec	12 May 2005 14:52:33 -0000	1.4
+++ python-protocols.spec	13 Feb 2006 17:53:03 -0000	1.5
@@ -1,37 +1,37 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define python_abi %(%{__python} -c "import sys; print sys.version[:3]")
 
 %define srcname PyProtocols
 
 Name:           python-protocols
 Version:        0.9.3
-Release:        5%{?dist}
+Release:        7%{?dist}
 
 Summary:        Open Protocols and Component Adaptation for Python
 
 Group:          Development/Libraries
 License:        PSF or ZPL
 URL:            http://peak.telecommunity.com/PyProtocols.html
-Source0:        http://peak.telecommunity.com/dist/PyProtocols-0.9.3.tar.gz
-Source1:        setuptools.tar.gz
+Source0:        http://peak.telecommunity.com/dist/%{srcname}-%{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]")
+BuildRequires:  python-devel python-setuptools
+Requires:   python-abi = %{python_abi}
 
 %description
-PyProtocols is an implementation of PEP 246 allowing Python programmers to define
-Interfaces and adapters between them, thereby reducing or eliminating fragile 'isinstance'
-if type() comparisons.
+PyProtocols is an implementation of PEP 246 allowing Python programmers to
+define Interfaces and adapters between them, thereby reducing or eliminating
+fragile 'isinstance' if type() comparisons.
 
 %prep
-%setup -q -n %{srcname}-%{version} -a 1
+%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
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,8 +48,16 @@
 %{python_sitearch}/protocols/*/*.py
 %{python_sitearch}/protocols/*/*.pyc
 %ghost %{python_sitearch}/protocols/*/*.pyo
+%dir %{python_sitearch}/%{srcname}-%{version}-py%{python_abi}.egg-info
+%{python_sitearch}/%{srcname}-%{version}-py%{python_abi}.egg-info/*
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  0.9.3-7
+- Rebuild for FC5
+
+* Tue Jan 31 2006 Shahms E. King  0.9.3-6
+- BuildRequires setuptools, rather than including it
+
 * Thu May 12 2005 Shahms E. King  0.9.3-4
 - rebuilt, add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:49:49 -0000	1.2
+++ sources	13 Feb 2006 17:53:03 -0000	1.3
@@ -1,2 +1 @@
 50559c9869389e9d576b98f6382b1324  PyProtocols-0.9.3.tar.gz
-1fe0f57c72b81ab7fc357b972ba80f4b  setuptools.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 17:53:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:53:40 -0500
Subject: rpms/tagtool/devel tagtool.spec,1.2,1.3
Message-ID: <200602131754.k1DHsCvs017196@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	tagtool.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 0.12.2-3
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: tagtool.spec
===================================================================
RCS file: /cvs/extras/rpms/tagtool/devel/tagtool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tagtool.spec	25 Sep 2005 22:09:03 -0000	1.2
+++ tagtool.spec	13 Feb 2006 17:53:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		tagtool
 Version:	0.12.2
-Release:	4%{?dist}
+Release:	3%{?dist}
 Summary:	Ogg Vorbis and MP3 tag manager
 
 Group:		Applications/Multimedia
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 0.12.2-3
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Sep 25 2005 Brian Pepple  - 0.12.2-4
 - Add dist tag.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:54:42 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 13 Feb 2006 12:54:42 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.15,1.16
Message-ID: <200602131755.k1DHtEGm017312@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17250

Modified Files:
	xchat-gnome.spec 
Log Message:
* Mon Feb 13 2006 Brian Pepple  - 0.9-5
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xchat-gnome.spec	7 Feb 2006 16:53:20 -0000	1.15
+++ xchat-gnome.spec	13 Feb 2006 17:54:41 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           xchat-gnome
 Version:        0.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Brian Pepple  - 0.9-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Feb  7 2006 Brian Pepple  - 0.9-4
 - Rebuild due to new libsexy.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:56:02 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:56:02 -0500
Subject: rpms/python-psycopg/FC-3 python-psycopg.spec,1.5,1.6
Message-ID: <200602131756.k1DHuYVV017467@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17401/FC-3

Modified Files:
	python-psycopg.spec 
Log Message:
Rebuild for FC5



Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-3/python-psycopg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-psycopg.spec	6 Oct 2005 19:44:38 -0000	1.5
+++ python-psycopg.spec	13 Feb 2006 17:56:02 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-psycopg
 Version:        1.1.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  1.1.21-2
+- rebuild for FC5
+
 * Thu Oct 06 2005 Shahms E. King  1.1.21-1
 - update to new upstream version
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:56:08 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:56:08 -0500
Subject: rpms/python-psycopg/FC-4 python-psycopg.spec,1.6,1.7
Message-ID: <200602131756.k1DHue7g017470@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-psycopg.spec 
Log Message:
Rebuild for FC5



Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/FC-4/python-psycopg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-psycopg.spec	6 Oct 2005 19:44:02 -0000	1.6
+++ python-psycopg.spec	13 Feb 2006 17:56:07 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-psycopg
 Version:        1.1.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  1.1.21-2
+- rebuild for FC5
+
 * Thu Oct 06 2005 Shahms E. King  1.1.21-1
 - update to new upstream version
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:56:13 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:56:13 -0500
Subject: rpms/python-psycopg/devel python-psycopg.spec,1.6,1.7
Message-ID: <200602131756.k1DHuklu017473@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-psycopg.spec 
Log Message:
Rebuild for FC5



Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/python-psycopg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-psycopg.spec	6 Oct 2005 19:44:39 -0000	1.6
+++ python-psycopg.spec	13 Feb 2006 17:56:13 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-psycopg
 Version:        1.1.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
@@ -54,6 +54,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  1.1.21-2
+- rebuild for FC5
+
 * Thu Oct 06 2005 Shahms E. King  1.1.21-1
 - update to new upstream version
 



From fedora-extras-commits at redhat.com  Mon Feb 13 17:59:13 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:59:13 -0500
Subject: rpms/python-quixote/FC-4 python-quixote.spec,1.8,1.9
Message-ID: <200602131759.k1DHxjrF017567@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-quixote.spec 
Log Message:
Rebuild for FC5



Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/python-quixote.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-quixote.spec	14 Dec 2005 16:33:19 -0000	1.8
+++ python-quixote.spec	13 Feb 2006 17:59:13 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:           python-quixote
 Version:        2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A highly Pythonic Web application framework
 
 Group:          Development/Libraries
@@ -70,7 +70,10 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
-* Wed Dec 14 2005 Shahms E. King  2.4-2
+* Mon Feb 13 2006 Shahms E. King  2.4-2
+- Rebuild for FC5
+
+* Wed Dec 14 2005 Shahms E. King  2.4-1
 - update to new upstream 2.4
 
 * Wed Oct 19 2005 Shahms E. King  2.3-1



From fedora-extras-commits at redhat.com  Mon Feb 13 17:59:19 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 12:59:19 -0500
Subject: rpms/python-quixote/devel python-quixote.spec,1.8,1.9
Message-ID: <200602131759.k1DHxpIS017570@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-quixote.spec 
Log Message:
Rebuild for FC5



Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-quixote.spec	14 Dec 2005 16:33:25 -0000	1.8
+++ python-quixote.spec	13 Feb 2006 17:59:19 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:           python-quixote
 Version:        2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A highly Pythonic Web application framework
 
 Group:          Development/Libraries
@@ -70,7 +70,10 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
-* Wed Dec 14 2005 Shahms E. King  2.4-2
+* Mon Feb 13 2006 Shahms E. King  2.4-2
+- Rebuild for FC5
+
+* Wed Dec 14 2005 Shahms E. King  2.4-1
 - update to new upstream 2.4
 
 * Wed Oct 19 2005 Shahms E. King  2.3-1



From fedora-extras-commits at redhat.com  Mon Feb 13 18:01:32 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 13 Feb 2006 13:01:32 -0500
Subject: rpms/fonttools/devel fonttools.spec,1.2,1.3
Message-ID: <200602131802.k1DI25Ij019455@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	fonttools.spec 
Log Message:
* Mon Feb 13 2006 Roozbeh Pournader  - 2.0-0.5.20050624cvs
- Rebuild for Fedora Extras 5



Index: fonttools.spec
===================================================================
RCS file: /cvs/extras/rpms/fonttools/devel/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	13 Feb 2006 18:01:32 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           fonttools
 Version:        2.0
-Release:        0.4.%{alphatag}%{?dist}
+Release:        0.5.%{alphatag}%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
@@ -76,6 +76,9 @@
 
 
 %changelog
+* 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 Feb 13 18:01:37 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 13:01:37 -0500
Subject: rpms/python-simpletal/FC-4 python-simpletal.spec,1.6,1.7
Message-ID: <200602131802.k1DI2AnE019473@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-simpletal.spec 
Log Message:
Rebuild devel for FC5



Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-4/python-simpletal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-simpletal.spec	30 Jan 2006 23:59:18 -0000	1.6
+++ python-simpletal.spec	13 Feb 2006 18:01:37 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-simpletal
 Version:        4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
 
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  4.1-2
+- Rebuild for FC5
+
 * Mon Jan 30 2006 Shahms E. King  4.1-1
 - Update to new upstream version 4.1
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:02:01 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 13:02:01 -0500
Subject: rpms/python-simpletal/devel python-simpletal.spec,1.6,1.7
Message-ID: <200602131802.k1DI2YX3019478@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-simpletal.spec 
Log Message:
Rebuild devel for FC5



Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/python-simpletal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-simpletal.spec	30 Jan 2006 23:59:25 -0000	1.6
+++ python-simpletal.spec	13 Feb 2006 18:02:00 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-simpletal
 Version:        4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
 
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  4.1-2
+- Rebuild for FC5
+
 * Mon Jan 30 2006 Shahms E. King  4.1-1
 - Update to new upstream version 4.1
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:01:29 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 13:01:29 -0500
Subject: rpms/python-simpletal/FC-3 python-simpletal.spec,1.5,1.6
Message-ID: <200602131802.k1DI2YZQ019479@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19387/FC-3

Modified Files:
	python-simpletal.spec 
Log Message:
Rebuild devel for FC5



Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-3/python-simpletal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-simpletal.spec	30 Jan 2006 23:59:13 -0000	1.5
+++ python-simpletal.spec	13 Feb 2006 18:01:28 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-simpletal
 Version:        4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
 
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  4.1-2
+- Rebuild for FC5
+
 * Mon Jan 30 2006 Shahms E. King  4.1-1
 - Update to new upstream version 4.1
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:04:25 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 13:04:25 -0500
Subject: rpms/python-tpg/FC-4 python-tpg.spec,1.5,1.6
Message-ID: <200602131804.k1DI4vKa019656@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-tpg.spec 
Log Message:
Rebuild devel for FC5



Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-4/python-tpg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-tpg.spec	30 Jan 2006 23:54:38 -0000	1.5
+++ python-tpg.spec	13 Feb 2006 18:04:08 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-tpg
 Version:        3.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  3.0.6-2
+- rebuild for FC5
+
 * Mon Jan 30 2006 Shahms E. King  3.0.6-1
 - update to upstream 3.0.6
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:04:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 13 Feb 2006 13:04:27 -0500
Subject: owners owners.list,1.635,1.636
Message-ID: <200602131804.k1DI4xkv019659@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	owners.list 
Log Message:
Take ownership of perl-Parse-Yapp



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -r1.635 -r1.636
--- owners.list	13 Feb 2006 16:28:31 -0000	1.635
+++ owners.list	13 Feb 2006 18:04:26 -0000	1.636
@@ -927,7 +927,7 @@
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-CPAN-Packages|Parse::CPAN::Packages Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-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



From fedora-extras-commits at redhat.com  Mon Feb 13 18:04:31 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 13:04:31 -0500
Subject: rpms/python-tpg/devel python-tpg.spec,1.5,1.6
Message-ID: <200602131805.k1DI53Yh019662@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	python-tpg.spec 
Log Message:
Rebuild devel for FC5



Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/python-tpg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-tpg.spec	30 Jan 2006 23:54:44 -0000	1.5
+++ python-tpg.spec	13 Feb 2006 18:04:31 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-tpg
 Version:        3.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  3.0.6-2
+- rebuild for FC5
+
 * Mon Jan 30 2006 Shahms E. King  3.0.6-1
 - update to upstream 3.0.6
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:04:01 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 13 Feb 2006 13:04:01 -0500
Subject: rpms/python-tpg/FC-3 python-tpg.spec,1.4,1.5
Message-ID: <200602131805.k1DI53SJ019663@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19556/FC-3

Modified Files:
	python-tpg.spec 
Log Message:
Rebuild devel for FC5



Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-3/python-tpg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-tpg.spec	30 Jan 2006 23:54:32 -0000	1.4
+++ python-tpg.spec	13 Feb 2006 18:04:01 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           python-tpg
 Version:        3.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Feb 13 2006 Shahms E. King  3.0.6-2
+- rebuild for FC5
+
 * Mon Jan 30 2006 Shahms E. King  3.0.6-1
 - update to upstream 3.0.6
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:06:43 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 13 Feb 2006 13:06:43 -0500
Subject: rpms/fontforge/devel fontforge.spec,1.16,1.17
Message-ID: <200602131807.k1DI7OZT019743@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	fontforge.spec 
Log Message:
* Mon Feb 13 2006 Roozbeh Pournader  - 20060125-6
- Rebuild for Fedora Extras 5



Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fontforge.spec	12 Feb 2006 20:35:26 -0000	1.16
+++ fontforge.spec	13 Feb 2006 18:06:43 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           fontforge
 Version:        20060125
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Roozbeh Pournader  - 20060125-6
+- Rebuild for Fedora Extras 5
+
 * Sun Feb 12 2006 Roozbeh Pournader  - 20060125-5
 - Add patch to fix crash (#181052, George Williams)
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:09:57 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 13 Feb 2006 13:09:57 -0500
Subject: rpms/qof/devel qof.spec,1.11,1.12
Message-ID: <200602131810.k1DIAT2h019838@cvs-int.fedora.redhat.com>

Author: toshio

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

Modified Files:
	qof.spec 
Log Message:
* Mon Feb 13 2006 Toshio Kuratomi  - 0.6.1-2
- Bump and rebuild for FC5.



Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qof.spec	15 Jan 2006 18:50:01 -0000	1.11
+++ qof.spec	13 Feb 2006 18:09:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -119,6 +119,9 @@
 %doc html
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Mon Feb 13 18:10:24 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 13 Feb 2006 13:10:24 -0500
Subject: rpms/nazghul/devel nazghul-0.5.3-64bit.patch, NONE, 1.1 nazghul.spec,
	1.1, 1.2
Message-ID: <200602131810.k1DIAuID019849@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	nazghul.spec 
Added Files:
	nazghul-0.5.3-64bit.patch 
Log Message:
* Mon Feb 13 2006 Jason L Tibbitts III  - 0.5.3-3
- Add some 64-bit cleanliness fixes.


nazghul-0.5.3-64bit.patch:

--- NEW FILE nazghul-0.5.3-64bit.patch ---
--- src/map.c.64bit	2006-02-02 01:09:46.000000000 -0600
+++ src/map.c	2006-02-13 10:13:28.615918105 -0600
@@ -110,7 +110,7 @@
 // This one is used during mapMergeLightSource:
 static unsigned char tmp_lmap[VMASK_W * VMASK_H];
 
-static void myRmView(struct mview *view, void *data)
+static void myRmView(struct mview *view, int data)
 {
 	list_remove(&view->list);
 }
@@ -175,7 +175,7 @@
 	}
 }
 
-static void mapMergeView(struct mview *view, void *data)
+static void mapMergeView(struct mview *view, int data)
 {
 	int r_src, r_src_start, c_src, c_src_start, i_src, r_end, c_end;
 	int r_dst, r_dst_start, c_dst, c_dst_start, i_dst;
@@ -254,14 +254,13 @@
 
 }
 
-static void myMarkAsDirty(struct mview *view, void *data)
+static void myMarkAsDirty(struct mview *view, int data)
 {
 	view->dirty = 1;
 }
 
-static void mySetViewLightRadius(struct mview *view, void *data)
+static void mySetViewLightRadius(struct mview *view, int rad)
 {
-	int rad = (int) data;
 	view->rad = rad;
 }
 
@@ -482,7 +481,7 @@
 	Map.cam_y = max(Map.cam_y, Map.cam_min_y);
 }
 
-void mapForEachView(void (*fx) (struct mview *, void *), void *data)
+void mapForEachView(void (*fx) (struct mview *, int), int data)
 {
 	struct list *list;
 	list = Map.views.next;
@@ -1055,9 +1054,9 @@
 void mapSetRadius(struct mview *view, int rad)
 {
 	if (view == ALL_VIEWS)
-		mapForEachView(mySetViewLightRadius, (void *) rad);
+		mapForEachView(mySetViewLightRadius, rad);
 	else
-		mySetViewLightRadius(view, (void *) rad);
+		mySetViewLightRadius(view, rad);
 }
 
 int mapGetRadius(struct mview *view)


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nazghul.spec	13 Feb 2006 15:37:20 -0000	1.1
+++ nazghul.spec	13 Feb 2006 18:10:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           nazghul
 Version:        0.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Source1:	haxima.desktop
 Source2:	haxima.png
 Patch0:		nazghul-haxima-startup.patch
+Patch1:		nazghul-0.5.3-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL_image-devel, desktop-file-utils
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0
+%patch1 -b .64bit
 
 
 %build
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Jason L Tibbitts III  - 0.5.3-3
+- Add some 64-bit cleanliness fixes.
+
 * Tue Feb  7 2006 Jason L Tibbitts III  - 0.5.3-2
 - Incorporate some review suggestions
 - Patch bug with generation of haxima.sh.



From fedora-extras-commits at redhat.com  Mon Feb 13 18:14:23 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 13 Feb 2006 13:14:23 -0500
Subject: rpms/glunarclock/devel glunarclock.spec,1.11,1.12
Message-ID: <200602131814.k1DIEtR1019959@cvs-int.fedora.redhat.com>

Author: jsoeterb

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

Modified Files:
	glunarclock.spec 
Log Message:
Rebuild for Fedora Extras 5


Index: glunarclock.spec
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- glunarclock.spec	18 Aug 2005 20:07:40 -0000	1.11
+++ glunarclock.spec	13 Feb 2006 18:14:23 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           glunarclock
 Version:        0.32.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME applet that displays the current lunar phase
 
 Group:          User Interface/Desktops
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Joost Soeterbroek  - 0.32.4-4
+- Rebuild for Fedora Extras 5
+
 * Thu Aug 18 2005 Michael Schwendt  - 0.32.4-3
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:16:37 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 13 Feb 2006 13:16:37 -0500
Subject: rpms/qtparted/devel qtparted.spec,1.11,1.12
Message-ID: <200602131817.k1DIH9jk020043@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	qtparted.spec 
Log Message:
Bump Release for rebuild.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qtparted.spec	14 Nov 2005 18:46:14 -0000	1.11
+++ qtparted.spec	13 Feb 2006 18:16:37 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Steven Pritchard  - 0.4.5-4
+- Rebuild.
+
 * Mon Nov 14 2005 Steven Pritchard  - 0.4.5-3
 - Remove BR XFree86-devel.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:18:58 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 13 Feb 2006 13:18:58 -0500
Subject: rpms/glunarclock/devel glunarclock.spec,1.12,1.13
Message-ID: <200602131819.k1DIJU4g020175@cvs-int.fedora.redhat.com>

Author: jsoeterb

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

Modified Files:
	glunarclock.spec 
Log Message:
Bump release to make tag


Index: glunarclock.spec
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- glunarclock.spec	13 Feb 2006 18:14:23 -0000	1.12
+++ glunarclock.spec	13 Feb 2006 18:18:58 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           glunarclock
 Version:        0.32.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME applet that displays the current lunar phase
 
 Group:          User Interface/Desktops
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Joost Soeterbroek  - 0.32.4-5
+- Bump release to make tag
+
 * Mon Feb 13 2006 Joost Soeterbroek  - 0.32.4-4
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:21:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Feb 2006 13:21:37 -0500
Subject: rpms/lyx/devel lyx-1.4.0pre5-boost.patch, NONE, 1.1 lyx.spec, 1.19,
	1.20
Message-ID: <200602131822.k1DIMARD020333@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.4.0pre5-boost.patch 
Log Message:
* Mon Feb 13 2006 Rex Dieter  1.4.0-0.6.pre5
- --without-included-boost
- BR: boost-devel


lyx-1.4.0pre5-boost.patch:

--- NEW FILE lyx-1.4.0pre5-boost.patch ---
--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/pch.h	2006-02-13 11:46:38.000000000 -0600
@@ -17,7 +17,12 @@
 #include 
 #include 
 #include 
+#include 
+#if (BOOST_VERSION >= 103300)
+#include 
+#else
 #include 
+#endif
 #include 
 #include 
 #include 
--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
+++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-13 11:55:22.000000000 -0600
@@ -38,7 +38,13 @@
 
 #include 
 #include 
+// Not sure about this one (?) -- Rex
+#include 
+#if (BOOST_VERSION >= 103300)
+#include 
+#else
 #include 
+#endif
 
 #include 
 
--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/support/pch.h	2006-02-13 11:50:33.000000000 -0600
@@ -10,7 +10,12 @@
 #include 
 #include 
 #include 
+#include 
+#if (BOOST_VERSION >= 103300)
+#include 
+#else
 #include 
+#endif
 #include 
 #include 
 
--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
+++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-13 11:47:16.000000000 -0600
@@ -14,7 +14,12 @@
 
 #include 
 
+#include 
+#if (BOOST_VERSION >= 103300)
+#include 
+#else
 #include 
+#endif
 
 #ifdef DEBUG
 # define TEMPORARY_DEBUG_MACRO DEBUG


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lyx.spec	13 Feb 2006 16:15:28 -0000	1.19
+++ lyx.spec	13 Feb 2006 18:21:37 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.5.%{beta}%{?dist}
+Release: 0.6.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -13,6 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0pre5-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -40,6 +41,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+BuildRequires: boost-devel
 
 # For texhash
 Requires(post): tetex-fonts
@@ -93,6 +95,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%patch2 -p2 -b .boost
 
 # ./autogen.sh
 
@@ -112,6 +115,7 @@
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-aspell \
+  --without-included-boost \
   --without-warnings --disable-debug --disable-dependency-tracking
 
 # Intermediate cleanup
@@ -198,6 +202,10 @@
 
 
 %changelog
+* Mon Feb 13 2006 Rex Dieter  1.4.0-0.6.pre5
+- --without-included-boost
+- BR: boost-devel
+
 * Mon Feb 13 2006 Rex Dieter  1.4.0-0.5.pre5
 - 1.4.0pre5
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:21:37 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Feb 2006 13:21:37 -0500
Subject: rpms/cln/devel cln.spec,1.18,1.19
Message-ID: <200602131822.k1DIMAZL020334@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	cln.spec 
Log Message:
Disable static build, enable parallel build.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cln.spec	13 Feb 2006 17:41:50 -0000	1.18
+++ cln.spec	13 Feb 2006 18:21:37 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -35,8 +35,8 @@
 %setup -q
 
 %build
-%configure
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -75,10 +75,13 @@
 %{_mandir}/man1/cln-config.1*
 %{_bindir}/cln-config
 %{_datadir}/aclocal/cln.m4
-%exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Feb 13 2006 Quentin Spencer  1.1.11-5
+- Disable static build.
+- Enable parallel build.
+
 * Mon Feb 13 2006 Quentin Spencer  1.1.11-4
 - Rebuild for Fedora Extras 5.
 - Remove /usr/share/info/dir after install.



From fedora-extras-commits at redhat.com  Mon Feb 13 18:22:17 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 13 Feb 2006 13:22:17 -0500
Subject: rpms/clearsilver/devel clearsilver.spec,1.1,1.2
Message-ID: <200602131822.k1DIMnKm020422@cvs-int.fedora.redhat.com>

Author: jsoeterb

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

Modified Files:
	clearsilver.spec 
Log Message:
Rebuild for Fedora Extras 5


Index: clearsilver.spec
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/devel/clearsilver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clearsilver.spec	8 Jan 2006 17:15:17 -0000	1.1
+++ clearsilver.spec	13 Feb 2006 18:22:17 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           clearsilver
 Version:        0.10.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fast and powerful HTML templating system
 Group:          Development/Libraries
 License:        Neotonic ClearSilver Software License
@@ -162,6 +162,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Joost Soeterbroek  - 0.10.2-3
+- Rebuild for Fedora Extras 5
+
 * Fri Jan  6 2006 Joost Soeterbroek  - 0.10.2-2
 - Rebuild with disable-ruby, disable-java for any arch other than i386
 - hardcoded version in Patch0



From fedora-extras-commits at redhat.com  Mon Feb 13 18:22:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Feb 2006 13:22:36 -0500
Subject: rpms/compface/devel compface.spec,1.8,1.9
Message-ID: <200602131823.k1DIN8DO020425@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	compface.spec 
Log Message:
* Mon Feb 13 2006 Ville Skytt??  - 1.4-6
- Rebuild.



Index: compface.spec
===================================================================
RCS file: /cvs/extras/rpms/compface/devel/compface.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compface.spec	6 Apr 2005 22:11:35 -0000	1.8
+++ compface.spec	13 Feb 2006 18:22:36 -0000	1.9
@@ -1,7 +1,6 @@
 Name:           compface
 Version:        1.4
-Release:        5
-
+Release:        6%{?dist}
 Summary:        Library for handling X-Faces
 
 Group:          System Environment/Libraries
@@ -57,7 +56,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Mon Feb 13 2006 Ville Skytt??  - 1.4-6
+- Rebuild.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.4-5
 - rebuilt
 
 * Fri Dec 17 2004 Ville Skytt??  - 0:1.4-4



From fedora-extras-commits at redhat.com  Mon Feb 13 18:24:49 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 13 Feb 2006 13:24:49 -0500
Subject: rpms/foremost/devel foremost.spec,1.2,1.3
Message-ID: <200602131825.k1DIPLCE020648@cvs-int.fedora.redhat.com>

Author: toshio

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

Modified Files:
	foremost.spec 
Log Message:
* Mon Feb 13 2006 Toshio Kuratomi  1.1-1.1.20060128
- Note on upstream's "beta" system to keep future maintainers out of trouble.
- Rebuild for the FC5 push.



Index: foremost.spec
===================================================================
RCS file: /cvs/extras/rpms/foremost/devel/foremost.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- foremost.spec	29 Jan 2006 04:23:56 -0000	1.2
+++ foremost.spec	13 Feb 2006 18:24:48 -0000	1.3
@@ -1,15 +1,30 @@
 Name:           foremost
 Version:        1.1
-Release:        1%{?dist}
+# Note: This is a prerelease snapshot because upstream's release management
+# fooled me.  Move to a pre-release style tag modified for the initial
+# confusion.  Please see the Pre-Release section of:
+# http://www.fedoraproject.org/wiki/Packaging/NamingGuidelines
+# to figure out how to increment this for packaging changes.
+Release:        1.1.20060128%{?dist}
 Summary:        Recover files by "carving" them from a raw disk
 
 Group:          Applications/File
 License:        GPL
 URL:            http://foremost.sf.net
-# Upstream wasn't versioning their tarballs.  Record of the latest md5sum in
-# case that happens again.
-# b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz
+# Upstream is releasing new tarballs on foremost.sf.net/pkg (linked from the
+# foremost.sf.net website.) that have normal "x.y" style version numbers _but_
+# are essentially betas.  These files get overwritten as new "betas" are pushed.
+# When the release goes final, it is released through the normal sourceforge
+# file release mechanism with the same x.y version number.
+#
+# For sanity, in the future, we'll stick with packages released through the
+# sourceforge file release channel.  Since we've already been suckered in for
+# this cycle, I've reviewed the changes against foremost-1.0 and decided that
+# it's better to stick with the beta we currently have than to bump epoch and
+# go back to the 1.0 release.  MD5Sum of our download in January:
+# b606cc602f38f0e370531f5c7911addb foremost-1.1.tar.gz
 Source0:        http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz
+# Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1:       COPYING
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,6 +68,10 @@
 %config(noreplace) %{_sysconfdir}/foremost.conf
 
 %changelog
+* Mon Feb 13 2006 Toshio Kuratomi  1.1-1.1.20060128
+- Note on upstream's "beta" system to keep future maintainers out of trouble.
+- Rebuild for the FC5 push.
+  
 * Sat Jan 28 2006 Toshio Kuratomi  1.1-1
 - Upgrade to 1.1.
 - Rework the config patch as a sed replacement.



From fedora-extras-commits at redhat.com  Mon Feb 13 18:25:37 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 13 Feb 2006 13:25:37 -0500
Subject: rpms/trac/devel trac.spec,1.3,1.4
Message-ID: <200602131826.k1DIQ9c5020742@cvs-int.fedora.redhat.com>

Author: jsoeterb

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

Modified Files:
	trac.spec 
Log Message:
Rebuild for Fedora 5


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trac.spec	16 Jan 2006 19:58:22 -0000	1.3
+++ trac.spec	13 Feb 2006 18:25:37 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Feb 13 2006 Joost Soeterbroek  - 0.9.3-5
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 16 2006 Joost Soeterbroek  - 0.9.3-4
 - updated trac.conf to allow for trac.*cgi 
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:27:07 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 13 Feb 2006 13:27:07 -0500
Subject: rpms/git-core/devel .cvsignore, 1.17, 1.18 git.spec, 1.5,
	1.6 sources, 1.17, 1.18
Message-ID: <200602131827.k1DIRdaw020843@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20800

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Feb 2006 16:36:09 -0000	1.17
+++ .cvsignore	13 Feb 2006 18:27:06 -0000	1.18
@@ -1 +1 @@
-git-1.1.6.tar.gz
+git-1.2.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- git.spec	1 Feb 2006 16:36:09 -0000	1.5
+++ git.spec	13 Feb 2006 18:27:06 -0000	1.6
@@ -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.1.6
+Version: 	1.2.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Feb 13 2006 Chris Wright  1.2.0-1
+- git-1.2.0
+
 * Tue Feb 1 2006 Chris Wright  1.1.6-1
 - git-1.1.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Feb 2006 16:36:09 -0000	1.17
+++ sources	13 Feb 2006 18:27:06 -0000	1.18
@@ -1 +1 @@
-78a3cf399db4cdf6023647dc8a30e93b  git-1.1.6.tar.gz
+044a1e60cd247320c068749aa10a08f3  git-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 18:28:06 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Feb 2006 13:28:06 -0500
Subject: rpms/cln/FC-4 cln.spec,1.13,1.14
Message-ID: <200602131828.k1DISdjw020980@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	cln.spec 
Log Message:
Disable static build, enable parallel build.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/cln.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cln.spec	13 Feb 2006 17:46:08 -0000	1.13
+++ cln.spec	13 Feb 2006 18:28:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.11
-Release:        3%{?dist}
+Release:        2%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -35,8 +35,8 @@
 %setup -q
 
 %build
-%configure
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -75,15 +75,13 @@
 %{_mandir}/man1/cln-config.1*
 %{_bindir}/cln-config
 %{_datadir}/aclocal/cln.m4
-%exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 
 %changelog
-* Tue Jan 31 2006 Quentin Spencer  1.1.11-3
-- Disable static libs.
-
 * Tue Jan 31 2006 Quentin Spencer  1.1.11-2
+- Disable static libs.
 - Exclude /usr/share/info/dir from package.
+- Enable parallel build.
 
 * Mon Jan 16 2006 Quentin Spencer  1.1.11-1
 - New upstream release.



From fedora-extras-commits at redhat.com  Mon Feb 13 18:28:24 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 13 Feb 2006 13:28:24 -0500
Subject: rpms/freehdl import.log,1.2,1.3
Message-ID: <200602131828.k1DISumm020995@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freehdl/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Feb 2006 09:35:01 -0000	1.2
+++ import.log	13 Feb 2006 18:28:24 -0000	1.3
@@ -1 +1,2 @@
 freehdl-0_0_1-1:HEAD:freehdl-0.0.1-1.src.rpm:1139650493
+freehdl-0_0_1-2:HEAD:freehdl-0.0.1-2.src.rpm:1139855294



From fedora-extras-commits at redhat.com  Mon Feb 13 18:28:30 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 13 Feb 2006 13:28:30 -0500
Subject: rpms/freehdl/devel freehdl.diff,NONE,1.1 freehdl.spec,1.1,1.2
Message-ID: <200602131829.k1DIT2aA021011@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	freehdl.spec 
Added Files:
	freehdl.diff 
Log Message:
auto-import freehdl-0.0.1-2 on branch devel from freehdl-0.0.1-2.src.rpm

freehdl.diff:

--- NEW FILE freehdl.diff ---
--- freehdl-0.0.1/ieee/Makefile.in	2006-01-21 22:51:30.000000000 +0100
+++ freehdl-0.0.1/ieee/Makefile.in	2006-02-13 19:01:37.000000000 +0100
@@ -199,7 +199,7 @@
 SUFFIXES = .vhdl
 INCLUDES = -I $(top_srcdir) -I ..
 ieeedir = $(prefix)/share/freehdl/lib/ieee
-freehdllibdir = $(exec_prefix)/lib/freehdl
+freehdllibdir = $(libdir)/freehdl
 freehdllib_LTLIBRARIES = libieee.la
 libieee_la_SOURCES = std_logic_1164.cc numeric_std.cc numeric_bit.cc std_logic_signed.cc std_logic_unsigned.cc std_logic_arith.cc math_real.cc vital_timing.cc
 ieee_DATA = std_logic_1164.vhdl numeric_std.vhdl numeric_bit.vhdl std_logic_signed.vhdl std_logic_unsigned.vhdl std_logic_arith.vhdl math_real.vhdl vital_timing.vhdl


Index: freehdl.spec
===================================================================
RCS file: /cvs/extras/rpms/freehdl/devel/freehdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freehdl.spec	11 Feb 2006 09:35:07 -0000	1.1
+++ freehdl.spec	13 Feb 2006 18:28:30 -0000	1.2
@@ -1,10 +1,11 @@
 Summary: GPLed free VHDL
 Name: freehdl
 Version: 0.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 Source0: http://cran.mit.edu/~enaroska/%{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
@@ -15,6 +16,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -53,5 +55,8 @@
 %{_mandir}/man5/*
 
 %changelog
-* Mon Jan 23 2005 Eric Tanguy  0.0.1-1
+* Mon Feb 13 2006 Eric Tanguy  0.0.1-2
+- Add a patch for x86_64
+
+* Mon Jan 23 2006 Eric Tanguy  0.0.1-1
 - First build



From fedora-extras-commits at redhat.com  Mon Feb 13 18:28:57 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 13 Feb 2006 13:28:57 -0500
Subject: rpms/git-core/FC-4 .cvsignore, 1.17, 1.18 git.spec, 1.5, 1.6 sources,
	1.17, 1.18
Message-ID: <200602131829.k1DITTu7021050@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20994

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Feb 2006 16:38:25 -0000	1.17
+++ .cvsignore	13 Feb 2006 18:28:57 -0000	1.18
@@ -1 +1 @@
-git-1.1.6.tar.gz
+git-1.2.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- git.spec	1 Feb 2006 16:38:25 -0000	1.5
+++ git.spec	13 Feb 2006 18:28:57 -0000	1.6
@@ -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.1.6
+Version: 	1.2.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Feb 13 2006 Chris Wright  1.2.0-1
+- git-1.2.0
+
 * Tue Feb 1 2006 Chris Wright  1.1.6-1
 - git-1.1.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Feb 2006 16:38:25 -0000	1.17
+++ sources	13 Feb 2006 18:28:57 -0000	1.18
@@ -1 +1 @@
-78a3cf399db4cdf6023647dc8a30e93b  git-1.1.6.tar.gz
+044a1e60cd247320c068749aa10a08f3  git-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 18:30:49 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 13 Feb 2006 13:30:49 -0500
Subject: rpms/git-core/FC-3 .cvsignore, 1.17, 1.18 git.spec, 1.5, 1.6 sources,
	1.17, 1.18
Message-ID: <200602131831.k1DIVM2n021253@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21208

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Feb 2006 16:42:29 -0000	1.17
+++ .cvsignore	13 Feb 2006 18:30:49 -0000	1.18
@@ -1 +1 @@
-git-1.1.6.tar.gz
+git-1.2.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- git.spec	1 Feb 2006 16:42:29 -0000	1.5
+++ git.spec	13 Feb 2006 18:30:49 -0000	1.6
@@ -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.1.6
+Version: 	1.2.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Feb 13 2006 Chris Wright  1.2.0-1
+- git-1.2.0
+
 * Tue Feb 1 2006 Chris Wright  1.1.6-1
 - git-1.1.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Feb 2006 16:42:29 -0000	1.17
+++ sources	13 Feb 2006 18:30:49 -0000	1.18
@@ -1 +1 @@
-78a3cf399db4cdf6023647dc8a30e93b  git-1.1.6.tar.gz
+044a1e60cd247320c068749aa10a08f3  git-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 18:31:17 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 13 Feb 2006 13:31:17 -0500
Subject: rpms/apcupsd/devel .cvsignore, 1.4, 1.5 apcupsd.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200602131831.k1DIVndb021305@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
-Update to 3.12.2
- Don't strip binaries



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jan 2006 16:56:55 -0000	1.4
+++ .cvsignore	13 Feb 2006 18:31:17 -0000	1.5
@@ -1 +1 @@
-apcupsd-3.12.1.tar.gz
+apcupsd-3.12.2.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apcupsd.spec	10 Jan 2006 16:56:55 -0000	1.7
+++ apcupsd.spec	13 Feb 2006 18:31:17 -0000	1.8
@@ -1,5 +1,5 @@
 Name:         apcupsd
-Version:      3.12.1
+Version:      3.12.2
 Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
@@ -44,7 +44,8 @@
 %setup -q
 %patch -p1 -b .init
 dos2unix examples/*status examples/*.c
-
+# Don't strip binaries
+sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in
 
 %build
 %configure \
@@ -142,6 +143,10 @@
 
 
 %changelog
+* Tue Jan 10 2006 - Orion Poplawski  - 3.12.2-1
+- Update to 3.12.2
+- Don't strip binaries
+
 * Tue Jan 10 2006 - Orion Poplawski  - 3.12.1-1
 - Update to 3.12.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jan 2006 16:56:55 -0000	1.4
+++ sources	13 Feb 2006 18:31:17 -0000	1.5
@@ -1 +1 @@
-d2e710176430a28d624500e145d9ffe3  apcupsd-3.12.1.tar.gz
+f771fafbc06551e7820bd3d277b5cce3  apcupsd-3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 18:32:03 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 13 Feb 2006 13:32:03 -0500
Subject: rpms/gentium-fonts/devel gentium-fonts.spec,1.1,1.2
Message-ID: <200602131832.k1DIWZJ7021353@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20750

Modified Files:
	gentium-fonts.spec 
Log Message:
* Mon Feb 13 2006 Roozbeh Pournader  1.02-3
- Rebuild for Fedora Extras 5



Index: gentium-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/devel/gentium-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gentium-fonts.spec	22 Dec 2005 15:27:24 -0000	1.1
+++ gentium-fonts.spec	13 Feb 2006 18:32:03 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           gentium-fonts
 Version:        1.02
-Release:        2
+Release:        3
 Summary:        SIL Gentium fonts
 
 Group:          User Interface/X
@@ -74,6 +74,8 @@
 
 
 %changelog
+* Mon Feb 13 2006 Roozbeh Pournader  1.02-3
+- Rebuild for Fedora Extras 5
 
 * Wed Dec 21 2005 Roozbeh Porunader  1.02-2
 - Added comment to Source0 about where to get the file



From fedora-extras-commits at redhat.com  Mon Feb 13 18:39:58 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 13 Feb 2006 13:39:58 -0500
Subject: rpms/gv/devel gv.spec,1.5,1.6
Message-ID: <200602131840.k1DIeUGh021482@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	gv.spec 
Log Message:
Rebuild for gcc/glibc changes



Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/gv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gv.spec	1 Feb 2006 22:54:21 -0000	1.5
+++ gv.spec	13 Feb 2006 18:39:57 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
 Version: 3.6.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Publishing
 Requires: ghostscript
@@ -103,6 +103,9 @@
 %{_mandir}/man1/gv.*
 
 %changelog
+* Mod Feb 13 2006 Orion Poplawski  3.6.1-7
+- Rebuild for gcc/glibc changes
+
 * Wed Feb  1 2006 Orion Poplawski  3.6.1-6
 - Remove info dir file
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:40:04 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 13 Feb 2006 13:40:04 -0500
Subject: rpms/gtranslator/devel gtranslator.spec,1.8,1.9
Message-ID: <200602131840.k1DIea9G021488@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	gtranslator.spec 
Log Message:
* Mon Feb 13 2006 Roozbeh Pournader  1.1.6-3
- Rebuild for Fedora Extras 5



Index: gtranslator.spec
===================================================================
RCS file: /cvs/extras/rpms/gtranslator/devel/gtranslator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtranslator.spec	17 Jan 2006 11:27:22 -0000	1.8
+++ gtranslator.spec	13 Feb 2006 18:40:04 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gtranslator
 Version:	1.1.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	Gettext po file editor for GNOME
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Roozbeh Pournader  1.1.6-3
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 16 2006 Roozbeh Pournader  1.1.6-2
 - Add %{?dist} tag
 - Rebuild



From fedora-extras-commits at redhat.com  Mon Feb 13 18:43:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Feb 2006 13:43:58 -0500
Subject: rpms/lyx/devel lyx.spec,1.20,1.21
Message-ID: <200602131844.k1DIiUc7021543@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	lyx.spec 
Log Message:
fix application of patch



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lyx.spec	13 Feb 2006 18:21:37 -0000	1.20
+++ lyx.spec	13 Feb 2006 18:43:58 -0000	1.21
@@ -4,7 +4,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.6.%{beta}%{?dist}
+Release: 0.7.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -95,7 +95,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
-%patch2 -p2 -b .boost
+%patch2 -p1 -b .boost
 
 # ./autogen.sh
 
@@ -202,7 +202,7 @@
 
 
 %changelog
-* Mon Feb 13 2006 Rex Dieter  1.4.0-0.6.pre5
+* Mon Feb 13 2006 Rex Dieter  1.4.0-0.7.pre5
 - --without-included-boost
 - BR: boost-devel
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:46:40 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 13 Feb 2006 13:46:40 -0500
Subject: rpms/gv/devel gv.spec,1.6,1.7
Message-ID: <200602131847.k1DIlCCm021629@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	gv.spec 
Log Message:
Date typo



Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/gv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gv.spec	13 Feb 2006 18:39:57 -0000	1.6
+++ gv.spec	13 Feb 2006 18:46:40 -0000	1.7
@@ -103,7 +103,7 @@
 %{_mandir}/man1/gv.*
 
 %changelog
-* Mod Feb 13 2006 Orion Poplawski  3.6.1-7
+* Mon Feb 13 2006 Orion Poplawski  3.6.1-7
 - Rebuild for gcc/glibc changes
 
 * Wed Feb  1 2006 Orion Poplawski  3.6.1-6



From fedora-extras-commits at redhat.com  Mon Feb 13 18:50:15 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 13 Feb 2006 13:50:15 -0500
Subject: rpms/hdf5/devel hdf5.spec,1.7,1.8
Message-ID: <200602131850.k1DIomYo021704@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	hdf5.spec 
Log Message:
Rebuild for gcc/glibc changes



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hdf5.spec	21 Dec 2005 21:57:14 -0000	1.7
+++ hdf5.spec	13 Feb 2006 18:50:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -96,6 +96,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Mon Feb 13 2006 Orion Poplawski  1.6.5-3
+- Rebuild for gcc/glibc changes
+
 * Wed Dec 21 2005 Orion Poplawski  1.6.5-2
 - Don't ship h5perf with missing library
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:53:08 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 13 Feb 2006 13:53:08 -0500
Subject: rpms/hdf/devel hdf.spec,1.7,1.8
Message-ID: <200602131853.k1DIrf4o021781@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	hdf.spec 
Log Message:
Rebuild for gcc/glibc changes



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hdf.spec	8 Feb 2006 23:09:40 -0000	1.7
+++ hdf.spec	13 Feb 2006 18:53:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Mon Feb 13 2006 Orion Poplawski  4.2r1-9
+- Rebuild for gcc/glibc changes
+
 * Wed Feb  8 2006 Orion Poplawski  4.2r1-8
 - Compile with -DHAVE_NETCDF for gdl hdf/netcdf compatibility
 



From fedora-extras-commits at redhat.com  Mon Feb 13 18:56:09 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 13 Feb 2006 13:56:09 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.11,1.12
Message-ID: <200602131856.k1DIufB7021871@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	kdesvn.spec 
Log Message:
Rebuild for gcc/glibc changes



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdesvn.spec	1 Feb 2006 16:34:10 -0000	1.11
+++ kdesvn.spec	13 Feb 2006 18:56:09 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           kdesvn
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 - Orion Poplawski  - 0.7.3-2
+- Rebuild for gcc/glibc changes
+
 * Wed Feb  1 2006 - Orion Poplawski  - 0.7.3-1
 - Update to 0.7.3
 



From fedora-extras-commits at redhat.com  Mon Feb 13 19:08:06 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 13 Feb 2006 14:08:06 -0500
Subject: rpms/mediawiki/devel mediawiki.spec,1.2,1.3
Message-ID: <200602131908.k1DJ8dF2023797@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	mediawiki.spec 
Log Message:
* Mon Feb 13 2006 Roozbeh Pournader  - 1.5.6-6
- Rebuild for Fedora Extras 5



Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mediawiki.spec	6 Feb 2006 17:31:08 -0000	1.2
+++ mediawiki.spec	13 Feb 2006 19:08:06 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           mediawiki
 Version:        1.5.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
 Group:          Applications/Internet
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Roozbeh Pournader  - 1.5.6-6
+- Rebuild for Fedora Extras 5
+
 * Mon Feb 06 2006 Roozbeh Pournader  - 1.5.6-5
 - Put internal doc files in the right directory, renaming it
   back to docs (#180177)



From fedora-extras-commits at redhat.com  Mon Feb 13 19:11:14 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 13 Feb 2006 14:11:14 -0500
Subject: rpms/diction/devel diction.spec,1.2,1.3
Message-ID: <200602131911.k1DJBmgs023849@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	diction.spec 
Log Message:
FC5 Rebuild



Index: diction.spec
===================================================================
RCS file: /cvs/extras/rpms/diction/devel/diction.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- diction.spec	1 Feb 2006 02:17:48 -0000	1.2
+++ diction.spec	13 Feb 2006 19:11:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           diction
 Version:        1.08
-Release:        1.1%{?dist}
+Release:        1.2%{?dist}
 Summary:        Identifies diction and style errors
 
 Group:          Applications/Text
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Konstantin Ryabitsev  - 1.08-1.2
+- FC5 rebuild
+
 * Tue Jan 31 2006 Konstantin Ryabitsev  - 1.08-1.1
 - FC5 rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 19:11:20 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 13 Feb 2006 14:11:20 -0500
Subject: rpms/pytz/devel pytz.spec,1.5,1.6
Message-ID: <200602131911.k1DJBrLH023852@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	pytz.spec 
Log Message:
Rebuild for gcc/glibc changes



Index: pytz.spec
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pytz.spec	3 Jan 2006 18:41:21 -0000	1.5
+++ pytz.spec	13 Feb 2006 19:11:20 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pytz
 Version:        2005r
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        World Timezone Definitions for Python
 
 Group:          Development/Languages
@@ -47,6 +47,9 @@
 %{python_sitelib}/pytz/
 
 %changelog
+* Mon Feb 13 2006 Orion Poplawski  2005r-2
+- Rebuild for gcc/glibc changes
+
 * Tue Jan  3 2006 Orion Poplawski  2005r-1
 - Update to 2005r
 



From fedora-extras-commits at redhat.com  Mon Feb 13 19:14:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 14:14:17 -0500
Subject: rpms/perl-GD/devel perl-GD.spec,1.9,1.10
Message-ID: <200602131914.k1DJEngP023985@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	perl-GD.spec 
Log Message:
Modular X (libX11-devel).


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-GD.spec	21 Oct 2005 15:42:25 -0000	1.9
+++ perl-GD.spec	13 Feb 2006 19:14:17 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-GD
 Version:        2.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -12,9 +12,9 @@
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
-BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, XFree86-devel
+BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, libX11-devel
 Requires:       gd >= 2.0.28
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This is a autoloadable interface module for GD, a popular library
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Jose Pedro Oliveira  - 2.30-2
+- Modular X (libX11-devel).
+
 * Fri Oct 21 2005 Jose Pedro Oliveira  - 2.30-1
 - Update to 2.30.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 19:14:38 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 13 Feb 2006 14:14:38 -0500
Subject: rpms/kdissert/devel kdissert.spec,1.3,1.4
Message-ID: <200602131915.k1DJFBPZ023990@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	kdissert.spec 
Log Message:
FC5 Rebuild



Index: kdissert.spec
===================================================================
RCS file: /cvs/extras/rpms/kdissert/devel/kdissert.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdissert.spec	28 Oct 2005 05:18:46 -0000	1.3
+++ kdissert.spec	13 Feb 2006 19:14:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kdissert
 Version:        1.0.5
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Mind-mapping tool for KDE
 
 Group:          Applications/Productivity
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Konstantin Ryabitsev  - 1.0.5-1.1
+- FC5 Rebuild.
+
 * Fri Oct 28 2005 Konstantin Ryabitsev  1.0.5-1
 - Extras rebuild.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 19:17:29 2006
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Mon, 13 Feb 2006 14:17:29 -0500
Subject: rpms/splint/devel splint.spec,1.4,1.5
Message-ID: <200602131918.k1DJI2wj024119@cvs-int.fedora.redhat.com>

Author: pnasrat

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

Modified Files:
	splint.spec 
Log Message:
rebuild


Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- splint.spec	16 Jan 2006 13:13:03 -0000	1.4
+++ splint.spec	13 Feb 2006 19:17:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Paul Nasrat  - 3.1.1-12
+- FC5 rebuild for new gcc
+
 * Sun Jan 15 2006 Paul Nasrat  - 3.1.1-11
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Mon Feb 13 19:17:56 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 13 Feb 2006 14:17:56 -0500
Subject: rpms/libxml++/devel libxml++.spec,1.11,1.12
Message-ID: <200602131918.k1DJISu7024122@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	libxml++.spec 
Log Message:
FC5 Rebuild



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxml++.spec	26 Jan 2006 15:25:45 -0000	1.11
+++ libxml++.spec	13 Feb 2006 19:17:55 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libxml++
 Version:        2.12.0
-Release:        2%{?dist}
+Release:        2.1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Mon Feb 13 19:21:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 14:21:34 -0500
Subject: rpms/perl-GD/devel perl-GD.spec,1.10,1.11
Message-ID: <200602131922.k1DJM6Co024249@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	perl-GD.spec 
Log Message:
Also libXpm-devel.


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-GD.spec	13 Feb 2006 19:14:17 -0000	1.10
+++ perl-GD.spec	13 Feb 2006 19:21:33 -0000	1.11
@@ -12,7 +12,7 @@
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
-BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, libX11-devel
+BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, libX11-devel, libXpm-devel
 Requires:       gd >= 2.0.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -65,7 +65,7 @@
 
 %changelog
 * Mon Feb 13 2006 Jose Pedro Oliveira  - 2.30-2
-- Modular X (libX11-devel).
+- Modular X (libX11-devel, libXpm-devel).
 
 * Fri Oct 21 2005 Jose Pedro Oliveira  - 2.30-1
 - Update to 2.30.



From fedora-extras-commits at redhat.com  Mon Feb 13 19:21:48 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 13 Feb 2006 14:21:48 -0500
Subject: rpms/qscintilla/devel qscintilla.spec,1.2,1.3
Message-ID: <200602131922.k1DJMKjm024254@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	qscintilla.spec 
Log Message:
FC5 Rebuild



Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qscintilla.spec	1 Feb 2006 02:20:42 -0000	1.2
+++ qscintilla.spec	13 Feb 2006 19:21:48 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:	        qscintilla 
 Version:        1.6
-Release:        3.1%{?dist}
+Release:        3.2%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPL
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Konstantin Ryabitsev  - 1.6-3.2
+- FC5 Rebuild.
+
 * Tue Jan 31 2006 Konstantin Ryabitsev  - 1.6-3.1
 - Rebuild for FC5.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 19:30:32 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 13 Feb 2006 14:30:32 -0500
Subject: rpms/verbiste/devel verbiste.spec,1.8,1.9
Message-ID: <200602131931.k1DJV5Gh024454@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	verbiste.spec 
Log Message:
FC5 Rebuild



Index: verbiste.spec
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- verbiste.spec	12 Dec 2005 16:07:06 -0000	1.8
+++ verbiste.spec	13 Feb 2006 19:30:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           verbiste
 Version:        0.1.14
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        French conjugation system
 
 Group:          Applications/Text
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Konstantin Ryabitsev  - 0.1.14-1.1
+- FC5 Rebuild
+
 * Mon Dec 12 2005 Konstantin Ryabitsev  - 0.1.14-1
 - Version 0.1.14
 - Switch to RPM_BUILD_ROOT notation



From fedora-extras-commits at redhat.com  Mon Feb 13 19:50:35 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Mon, 13 Feb 2006 14:50:35 -0500
Subject: rpms/jed/devel jed.spec,1.8,1.9
Message-ID: <200602131951.k1DJp7X8024636@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	jed.spec 
Log Message:
fix build



Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jed.spec	13 Feb 2006 17:47:54 -0000	1.8
+++ jed.spec	13 Feb 2006 19:50:35 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
 Version: 0.99.17
-Release: 0.pre135.2
+Release: 0.pre135.3
 License: GPL
 Group: Applications/Editors
 Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/pre-0.99-17/jed-B0.99-17.135.tar.bz2
@@ -11,7 +11,7 @@
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
 Obsoletes: jed-common jed-xjed
-BuildPrereq: slang-devel >= 2.0, autoconf
+BuildPrereq: slang-devel >= 2.0, autoconf, libselinux-devel
 BuildRoot: /var/tmp/jed-root
 
 %description
@@ -68,7 +68,7 @@
 %{_datadir}/jed
 
 %changelog
-* Mon Feb 13 2006 Bill Nottingham  0.99.17-0.pre135.2
+* Mon Feb 13 2006 Bill Nottingham  - 0.99.17-0.pre135.3
 - bump for rebuild
 
 * Mon May  9 2005 Bill Nottingham  0.99.16-10



From fedora-extras-commits at redhat.com  Mon Feb 13 19:50:49 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Mon, 13 Feb 2006 14:50:49 -0500
Subject: rpms/wxGTK/devel wxGTK.spec,1.16,1.17
Message-ID: <200602131951.k1DJpLki024679@cvs-int.fedora.redhat.com>

Author: mattdm

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

Modified Files:
	wxGTK.spec 
Log Message:
rebuild in preparation for FC5



Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wxGTK.spec	6 Feb 2006 19:39:37 -0000	1.16
+++ wxGTK.spec	13 Feb 2006 19:50:49 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           wxGTK
 Version:        2.6.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -172,6 +172,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Matthew Miller  - 2.6.2-5
+- rebuild in preparation for FC5
+
 * Mon Feb 06 2006 Matthew Miller  - 2.6.2-4
 - add wxGTK-2.6.2-socketclosefix.patch to fix aMule crashes. see
   bugzilla bug #178184



From fedora-extras-commits at redhat.com  Mon Feb 13 20:03:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Feb 2006 15:03:28 -0500
Subject: rpms/gdome2/devel gdome2.spec,1.4,1.5
Message-ID: <200602132004.k1DK41TA026593@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	gdome2.spec 
Log Message:
* Mon Feb 13 2006 Ville Skytt??  - 0.8.1-3
- Rebuild.



Index: gdome2.spec
===================================================================
RCS file: /cvs/extras/rpms/gdome2/devel/gdome2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdome2.spec	9 Nov 2005 22:32:00 -0000	1.4
+++ gdome2.spec	13 Feb 2006 20:03:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gdome2
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DOM level 2 library for accessing XML files
 
 Group:          System Environment/Libraries
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Ville Skytt??  - 0.8.1-3
+- Rebuild.
+
 * Thu Nov 10 2005 Ville Skytt??  - 0.8.1-2
 - Fix description of -devel.
 - Don't use %%exclude.



From fedora-extras-commits at redhat.com  Mon Feb 13 20:07:29 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Feb 2006 15:07:29 -0500
Subject: rpms/libid3tag/devel libid3tag.spec,1.11,1.12
Message-ID: <200602132008.k1DK82mK026748@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	libid3tag.spec 
Log Message:
* Mon Feb 13 2006 Ville Skytt??  - 0.15.1b-2
- Rebuild.



Index: libid3tag.spec
===================================================================
RCS file: /cvs/extras/rpms/libid3tag/devel/libid3tag.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libid3tag.spec	9 Nov 2005 20:54:46 -0000	1.11
+++ libid3tag.spec	13 Feb 2006 20:07:29 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libid3tag
 Version:        0.15.1b
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ID3 tag manipulation library
 
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Ville Skytt??  - 0.15.1b-2
+- Rebuild.
+
 * Wed Nov  9 2005 Ville Skytt??  - 0.15.1b-1
 - Don't ship static libraries.
 - Embed *.pc in specfile to keep it in sync with the build.



From fedora-extras-commits at redhat.com  Mon Feb 13 20:13:27 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 13 Feb 2006 15:13:27 -0500
Subject: rpms/stellarium/FC-4 stellarium.spec,1.10,1.11
Message-ID: <200602132013.k1DKDxQ4026842@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	stellarium.spec 
Log Message:

  Description:
    Add SDL_mixer-devel as BuildRequires.



Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- stellarium.spec	11 Oct 2005 16:06:29 -0000	1.10
+++ stellarium.spec	13 Feb 2006 20:13:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -14,6 +14,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  ImageMagick
 BuildRequires:  libpng-devel
+BuildRequires:  SDL_mixer-devel
 
 %description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
@@ -62,6 +63,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 13 2006 Jochen Schmitt  0.7.1-3
+- Add SDL_mixer-devel as BuildRequires
+
 * Mon Oct 10 2005 Jochen Schmitt  0.7.1-2
 - use of %%find_lang
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:15:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Feb 2006 15:15:00 -0500
Subject: rpms/libmodplug/devel libmodplug.spec,1.7,1.8
Message-ID: <200602132015.k1DKFWcs026915@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	libmodplug.spec 
Log Message:
* Mon Feb 13 2006 Ville Skytt??  - 1:0.7-5
- Rebuild, cosmetics.



Index: libmodplug.spec
===================================================================
RCS file: /cvs/extras/rpms/libmodplug/devel/libmodplug.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libmodplug.spec	23 Aug 2005 16:10:13 -0000	1.7
+++ libmodplug.spec	13 Feb 2006 20:15:00 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libmodplug
 Version:        0.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -27,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+sed -i -e 's/\r//g' ChangeLog
 
 
 %build
@@ -65,6 +66,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Ville Skytt??  - 1:0.7-5
+- Rebuild, cosmetics.
+
 * Tue Aug 23 2005 Ville Skytt??  - 1:0.7-4
 - Don't ship static libs.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:22:55 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 13 Feb 2006 15:22:55 -0500
Subject: rpms/stellarium/devel stellarium.spec,1.12,1.13
Message-ID: <200602132023.k1DKNSsi027036@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	stellarium.spec 
Log Message:

  Description:
    Add SDL_mixer-devel as BuildRequires



Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stellarium.spec	12 Feb 2006 19:31:21 -0000	1.12
+++ stellarium.spec	13 Feb 2006 20:22:55 -0000	1.13
@@ -11,7 +11,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
+BuildRequires:  SDL_mixer-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  mesa-libGL-devel
 BuildRequires:  ImageMagick
 BuildRequires:  libpng-devel
 
@@ -62,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 13 2006 Jochen Schmitt  0.7.2-4
+- Add SDL_mixer-devel as BuildRequires:
+
 * Sun Feb 12 2006 Jochen Schmitt  0.7.1-3
 - Rebuilt for FC5
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:23:43 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 13 Feb 2006 15:23:43 -0500
Subject: rpms/gnotime/devel gnotime.spec,1.15,1.16
Message-ID: <200602132024.k1DKOFm8027061@cvs-int.fedora.redhat.com>

Author: toshio

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

Modified Files:
	gnotime.spec 
Log Message:
* Mon Feb 13 2006 Toshio Kuratomi  - 2.2.2-4
- Bump and rebuild for FC5.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnotime.spec	2 Feb 2006 23:36:42 -0000	1.15
+++ gnotime.spec	13 Feb 2006 20:23:42 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -111,6 +111,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Feb 13 2006 Toshio Kuratomi  - 2.2.2-4
+- Bump and rebuild for FC5.
+
 * Sun Jan 29 2006 Toshio Kuratomi  - 2.2.2-3
 - Work around autoconf macro brokenness with an extra BuildRequires.
 - No longer send HUP to gconfd.  This is no longer necessary in FC5+.



From fedora-extras-commits at redhat.com  Mon Feb 13 20:31:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 15:31:14 -0500
Subject: rpms/perl-Glib/devel .cvsignore, 1.9, 1.10 perl-Glib.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200602132031.k1DKVkwh027206@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.105.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Jan 2006 11:30:55 -0000	1.9
+++ .cvsignore	13 Feb 2006 20:31:13 -0000	1.10
@@ -1 +1 @@
-Glib-1.103.tar.gz
+Glib-1.105.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Glib.spec	19 Jan 2006 11:30:55 -0000	1.13
+++ perl-Glib.spec	13 Feb 2006 20:31:13 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           perl-Glib
-Version:        1.103
+Version:        1.105
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
@@ -66,6 +66,12 @@
 
 
 %changelog
+* Mon Feb 13 2006 Jose Pedro Oliveira  - 1.105-1
+- Update to 1.105.
+
+* Mon Feb  6 2006 Jose Pedro Oliveira  - 1.104-1
+- Update to 1.104 (fails one test in perl 5.8.8).
+
 * Thu Jan 19 2006 Jose Pedro Oliveira  - 1.103-1
 - Update to 1.103.
 - Provides list: filtered out perl(MY) (#177956).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Jan 2006 11:30:55 -0000	1.9
+++ sources	13 Feb 2006 20:31:13 -0000	1.10
@@ -1 +1 @@
-fe8d123a872776a0c5cae50d513bf938  Glib-1.103.tar.gz
+b3ab8094fb83d0931e4042f2f6704342  Glib-1.105.tar.gz



From fedora-extras-commits at redhat.com  Mon Feb 13 20:33:36 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Feb 2006 15:33:36 -0500
Subject: rpms/perl-Glib/devel perl-Glib.spec,1.14,1.15
Message-ID: <200602132034.k1DKY8xi027271@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	perl-Glib.spec 
Log Message:
make tag problem


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Glib.spec	13 Feb 2006 20:31:13 -0000	1.14
+++ perl-Glib.spec	13 Feb 2006 20:33:36 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Glib
 Version:        1.105
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Jose Pedro Oliveira  - 1.105-2
+- make tag problem.
+
 * Mon Feb 13 2006 Jose Pedro Oliveira  - 1.105-1
 - Update to 1.105.
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:34:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Feb 2006 15:34:25 -0500
Subject: rpms/neXtaw/devel neXtaw.spec,1.11,1.12
Message-ID: <200602132034.k1DKYvIj027335@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	neXtaw.spec 
Log Message:
* Mon Feb 13 2006 Ville Skytt??  - 0.15.1-8
- Rebuild.



Index: neXtaw.spec
===================================================================
RCS file: /cvs/extras/rpms/neXtaw/devel/neXtaw.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- neXtaw.spec	16 Nov 2005 21:00:21 -0000	1.11
+++ neXtaw.spec	13 Feb 2006 20:34:25 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:        Modified version of the Athena Widgets with N*XTSTEP appearance
 Name:           neXtaw
 Version:        0.15.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 URL:            http://siag.nu/neXtaw/
 Source0:        http://siag.nu/pub/neXtaw/%{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Ville Skytt??  - 0.15.1-8
+- Rebuild.
+
 * Fri Nov 11 2005 Ville Skytt??  - 0.15.1-7
 - Adapt to modular X11 packaging.
 - Don't ship static libraries by default.



From fedora-extras-commits at redhat.com  Mon Feb 13 20:41:29 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Mon, 13 Feb 2006 15:41:29 -0500
Subject: rpms/wxPythonGTK2/devel wxPython.spec,1.9,1.10
Message-ID: <200602132042.k1DKg1fZ027425@cvs-int.fedora.redhat.com>

Author: mattdm

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

Modified Files:
	wxPython.spec 
Log Message:
update for FC5; add note about future plans to changelog.



Index: wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/wxPythonGTK2/devel/wxPython.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wxPython.spec	11 May 2005 11:46:24 -0000	1.9
+++ wxPython.spec	13 Feb 2006 20:41:28 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:           wxPythonGTK2
 Version:        2.4.2.4
-Release:        7
+Release:        7.1
 Summary:        GUI toolkit for the Python programming language
 Group:          Development/Languages
 License:        LGPL
@@ -58,6 +58,12 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Mon Feb 13 2006 Matthew Miller  - 2.4.2.4-7.1
+- rebuild in preparation for FC5
+- note for future -- this package is soon to be replaced with
+  wxPython 2.6.2.3 (dropping the GTK2 from the package name). See
+  bug #163440 and bug #154618 for details.
+
 * Wed May 11 2005 Michael Schwendt  2.4.2.4-7
 - d'oh, it's sitearch here
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:44:15 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 13 Feb 2006 15:44:15 -0500
Subject: rpms/antiword/devel antiword.spec,1.11,1.12
Message-ID: <200602132044.k1DKim3N027500@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	antiword.spec 
Log Message:
* Mon Feb 13 2006 Adrian Reber  - 0.37-2
- rebuilt



Index: antiword.spec
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/antiword.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- antiword.spec	7 Dec 2005 14:33:42 -0000	1.11
+++ antiword.spec	13 Feb 2006 20:44:15 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:    MS Word to ASCII/Postscript converter
 Name:       antiword
 Version:    0.37
-Release:    1
+Release:    2
 Source:     http://www.winfield.demon.nl/linux/%{name}-%{version}.tar.gz
 URL:        http://www.winfield.demon.nl/
 Patch0:     antiword-0.32-fix-flags.patch
@@ -45,6 +45,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Mon Feb 13 2006 Adrian Reber  - 0.37-2
+- rebuilt
+
 * Wed Dec 07 2005 Adrian Reber  - 0.37-1
 - updated to 0.37
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:53:13 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 13 Feb 2006 15:53:13 -0500
Subject: rpms/bwbar/devel bwbar.spec,1.5,1.6
Message-ID: <200602132053.k1DKrjm8027619@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	bwbar.spec 
Log Message:
* Wed Feb 13 2006 Adrian Reber  - 1.2.2-4
- rebuilt



Index: bwbar.spec
===================================================================
RCS file: /cvs/extras/rpms/bwbar/devel/bwbar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bwbar.spec	6 Apr 2005 22:11:33 -0000	1.5
+++ bwbar.spec	13 Feb 2006 20:53:13 -0000	1.6
@@ -1,9 +1,7 @@
-# $Id$
-
 Summary:       Generate a readout of the current bandwidth use
 Name:          bwbar
 Version:       1.2.2
-Release:       3
+Release:       4
 
 License:       GPL
 Group:         System Environment/Base
@@ -72,6 +70,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Wed Feb 13 2006 Adrian Reber  - 1.2.2-4
+- rebuilt
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:56:12 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Feb 2006 15:56:12 -0500
Subject: rpms/libqalculate/devel libqalculate.spec,1.6,1.7
Message-ID: <200602132056.k1DKujsV027691@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	libqalculate.spec 
Log Message:
Rebuild for Fedora Extras 5



Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libqalculate.spec	27 Dec 2005 22:54:20 -0000	1.6
+++ libqalculate.spec	13 Feb 2006 20:56:12 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
 Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://qalculate.sourceforge.net/
@@ -73,6 +73,9 @@
 %{_bindir}/qalc
 
 %changelog
+* Mon Feb 13 2006 Deji Akingunola  - 0.9.2-2
+- Rebuild for Fedora Extras 5
+
 * Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
 - Upgrade to new version
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:58:09 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Feb 2006 15:58:09 -0500
Subject: rpms/gparted/devel gparted.spec,1.4,1.5
Message-ID: <200602132058.k1DKwfhE027759@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	gparted.spec 
Log Message:
* Mon Feb 13 2006 Deji Akingunola  - 0.2-2
- Rebuild for Fedora Extras 5



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gparted.spec	30 Jan 2006 16:37:15 -0000	1.4
+++ gparted.spec	13 Feb 2006 20:58:09 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.2
-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 Feb 13 2006 Deji Akingunola  - 0.2-2
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 30 2006 Deji Akingunola  - 0.2-1
 - New release
 



From fedora-extras-commits at redhat.com  Mon Feb 13 20:59:21 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Feb 2006 15:59:21 -0500
Subject: rpms/baobab/devel baobab.spec,1.11,1.12
Message-ID: <200602132059.k1DKxrJ6027820@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	baobab.spec 
Log Message:
* Mon Feb 13 2006 Deji Akingunola  - 2.3.1-2
- Rebuild for Fedora Extras 5



Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- baobab.spec	12 Jan 2006 17:36:55 -0000	1.11
+++ baobab.spec	13 Feb 2006 20:59:21 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        2.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -56,6 +56,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Mon Feb 13 2006 Deji Akingunola  - 2.3.1-2
+- Rebuild for Fedora Extras 5
+
 * Thu Jan 12 2006 Deji Akingunola  - 2.3.1-1
 - Take over packaging from Thorsten Leemhuis
 - Update to 2.3.1



From fedora-extras-commits at redhat.com  Mon Feb 13 21:00:26 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 13 Feb 2006 16:00:26 -0500
Subject: rpms/dclib/devel dclib.spec,1.6,1.7
Message-ID: <200602132100.k1DL0x7M027895@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	dclib.spec 
Log Message:
Rebuild for FE5


Index: dclib.spec
===================================================================
RCS file: /cvs/extras/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dclib.spec	27 Dec 2005 17:25:44 -0000	1.6
+++ dclib.spec	13 Feb 2006 21:00:26 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           dclib
 Version:        0.3.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Luke Macken  0.3.7-6
+- Rebuild for FE5
+
 * Tue Dec 27 2005 Luke Macken  0.3.7-5
 - Rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:01:11 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 13 Feb 2006 16:01:11 -0500
Subject: rpms/fbida/devel fbida.spec,1.12,1.13
Message-ID: <200602132101.k1DL1i6P029728@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	fbida.spec 
Log Message:
* Mon Feb 13 2006 Adrian Reber  - 2.03-10
- rebuilt



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fbida.spec	20 Jan 2006 09:10:02 -0000	1.12
+++ fbida.spec	13 Feb 2006 21:01:11 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -12,8 +12,6 @@
 BuildRequires:  libungif-devel curl-devel
 BuildRequires:  openmotif-devel
 BuildRequires:  libXpm-devel
-# this is until #173530 and #173884 is fixed
-BuildRequires:  libXau-devel
 Requires:       ImageMagick bitstream-vera-fonts
 
 %description
@@ -82,6 +80,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Feb 13 2006 Adrian Reber  - 2.03-10
+- rebuilt
+
 * Wed Jan 18 2006 Adrian Reber  - 2.03-9
 - this should finally work; also on x86_64
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:01:43 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Feb 2006 16:01:43 -0500
Subject: rpms/nautilus-actions/devel nautilus-actions.spec,1.3,1.4
Message-ID: <200602132102.k1DL2FiM029786@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29718

Modified Files:
	nautilus-actions.spec 
Log Message:
* Mon Feb 13 2006 Deji Akingunola  - 1.0-2
- Rebuild for Fedora Extras 5



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nautilus-actions.spec	8 Feb 2006 22:32:43 -0000	1.3
+++ nautilus-actions.spec	13 Feb 2006 21:01:42 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -77,6 +77,9 @@
 %{_datadir}/pixmaps/nautilus-actions-icon.png
 
 %changelog
+* Mon Feb 13 2006 Deji Akingunola  - 1.0-2
+- Rebuild for Fedora Extras 5
+
 * Wed Feb 8 2006 Deji Akingunola  - 1.0-1
 - New upstream version
 - Do away with gconf schemas installation



From fedora-extras-commits at redhat.com  Mon Feb 13 21:03:39 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Feb 2006 16:03:39 -0500
Subject: rpms/texmaker/devel texmaker.spec,1.2,1.3
Message-ID: <200602132104.k1DL4BhA029860@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	texmaker.spec 
Log Message:
* Mon Feb 13 2006 Deji Akingunola  - 1.12-4
- Rebuild for Fedora Extras 5



Index: texmaker.spec
===================================================================
RCS file: /cvs/extras/rpms/texmaker/devel/texmaker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- texmaker.spec	28 Oct 2005 17:24:35 -0000	1.2
+++ texmaker.spec	13 Feb 2006 21:03:38 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: LaTeX editor
 Name: texmaker
 Version: 1.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Publishing
 URL: http://www.xm1math.net/texmaker/
@@ -84,6 +84,9 @@
 %{_datadir}/icons/hicolor/*/apps/texmaker.png
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Mon Feb 13 21:05:20 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 13 Feb 2006 16:05:20 -0500
Subject: rpms/grip/devel grip.spec,1.10,1.11
Message-ID: <200602132105.k1DL5qTE029952@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	grip.spec 
Log Message:
* Mon Feb 13 2006 Adrian Reber  - 1:3.2.0-10
- rebuilt



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grip.spec	15 Nov 2005 07:12:08 -0000	1.10
+++ grip.spec	13 Feb 2006 21:05:19 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 13 2006 Adrian Reber  - 1:3.2.0-10
+- rebuilt
+
 * Tue Nov 15 2005 Adrian Reber  - 1:3.2.0-9
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:05:39 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Feb 2006 16:05:39 -0500
Subject: rpms/qalculate-gtk/devel qalculate-gtk.spec,1.6,1.7
Message-ID: <200602132106.k1DL6CBM029959@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29935

Modified Files:
	qalculate-gtk.spec 
Log Message:
* Mon Feb 13 2006 Deji Akingunola  - 0.9.2-2
- Rebuild for Fedora Extras 5



Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/qalculate-gtk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qalculate-gtk.spec	27 Dec 2005 23:12:13 -0000	1.6
+++ qalculate-gtk.spec	13 Feb 2006 21:05:38 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-gtk
 Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://qalculate.sourceforge.net/
@@ -62,6 +62,9 @@
 %{_datadir}/qalculate-gtk/
 
 %changelog
+* Mon Feb 13 2006 Deji Akingunola  - 0.9.2-2
+- Rebuild for Fedora Extras 5
+
 * Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
 - Upgrade to new version
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:07:09 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Feb 2006 16:07:09 -0500
Subject: rpms/qalculate-kde/devel qalculate-kde.spec,1.4,1.5
Message-ID: <200602132107.k1DL7fe5030068@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30050

Modified Files:
	qalculate-kde.spec 
Log Message:
* Mon Feb 13 2006 Deji Akingunola  - 0.9.2-2
- Rebuild for Fedora Extras 5



Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qalculate-kde.spec	27 Dec 2005 23:27:45 -0000	1.4
+++ qalculate-kde.spec	13 Feb 2006 21:06:54 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-kde
 Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://qalculate.sourceforge.net/
@@ -61,6 +61,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Feb 13 2006 Deji Akingunola  - 0.9.2-2
+- Rebuild for Fedora Extras 5
+
 * Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
 - Upgrade to new version
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:10:03 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 13 Feb 2006 16:10:03 -0500
Subject: rpms/ibmonitor/devel ibmonitor.spec,1.8,1.9
Message-ID: <200602132110.k1DLAaaU030148@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	ibmonitor.spec 
Log Message:
* Mon Feb 13 2006 Adrian Reber  - 1.3-3
- rebuilt



Index: ibmonitor.spec
===================================================================
RCS file: /cvs/extras/rpms/ibmonitor/devel/ibmonitor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ibmonitor.spec	6 Apr 2005 22:12:02 -0000	1.8
+++ ibmonitor.spec	13 Feb 2006 21:10:03 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           ibmonitor
 Version:        1.3
-Release:        2
+Release:        3
 
 Summary:        Interactive bandwidth monitor
 
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Adrian Reber  - 1.3-3
+- rebuilt
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:16:21 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Feb 2006 16:16:21 -0500
Subject: rpms/ucl/devel ucl.spec,1.7,1.8
Message-ID: <200602132116.k1DLGreg030297@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	ucl.spec 
Log Message:
* Mon Feb 13 2006 Ville Skytt??  - 1.03-5
- Rebuild.



Index: ucl.spec
===================================================================
RCS file: /cvs/extras/rpms/ucl/devel/ucl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ucl.spec	9 Nov 2005 07:12:39 -0000	1.7
+++ ucl.spec	13 Feb 2006 21:16:20 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           ucl
 Version:        1.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Portable lossless data compression library
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Ville Skytt??  - 1.03-5
+- Rebuild.
+
 * Wed Nov  9 2005 Ville Skytt??  - 1.03-4
 - Don't ship static libraries.
 - Build with dependency tracking disabled.



From fedora-extras-commits at redhat.com  Mon Feb 13 21:27:54 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Feb 2006 16:27:54 -0500
Subject: rpms/fftw/devel fftw.spec,1.11,1.12
Message-ID: <200602132128.k1DLSQqc030410@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	fftw.spec 
Log Message:
Rebuild for Fedora Extras 5, disable static libs, spec file cleanups.


Index: fftw.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw/devel/fftw.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fftw.spec	1 Feb 2006 20:52:23 -0000	1.11
+++ fftw.spec	13 Feb 2006 21:27:53 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fftw
 Version:        3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
@@ -41,25 +41,13 @@
 
 
 %build
+CONFIG_FLAGS="--enable-shared --disable-static --disable-dependency-tracking --enable-threads"
 pushd double
-	%ifarch i386
-		%configure \
-			--enable-shared \
-			--enable-threads \
-			--enable-i386-hacks
-	%else
-		%configure \
-			--enable-shared \
-			--enable-threads
-	%endif
+	%configure $CONFIG_FLAGS
 	make %{?_smp_mflags}
 popd
 pushd single
-	%configure \
-		--enable-shared \
-		--enable-type-prefix \
-		--enable-threads \
-		--enable-float
+	%configure $CONFIG_FLAGS --enable-single
 	make %{?_smp_mflags}
 popd
 
@@ -74,6 +62,7 @@
 pushd single
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 
 %clean
@@ -107,13 +96,16 @@
 %doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/
 %doc %{_infodir}/*.info*
 %exclude %{_libdir}/*.la
-%exclude %{_infodir}/dir
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
-%{_libdir}/*.a
 %{_libdir}/*.so
 
 %changelog
+* Mon Feb 13 2006 Quentin Spencer  3.1-2
+- Rebuild for Fedora Extras 5.
+- Disable static libs.
+- Remove obsolete configure options.
+
 * Wed Feb  1 2006 Quentin Spencer  3.1-1
 - Upgrade to the 3.x branch, incorporating changes from the fftw3 spec file.
 - Add dist tag.



From fedora-extras-commits at redhat.com  Mon Feb 13 21:35:04 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Feb 2006 16:35:04 -0500
Subject: rpms/fftw/FC-4 fftw.spec,1.11,1.12
Message-ID: <200602132135.k1DLZbAn030508@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	fftw.spec 
Log Message:
Disable static libs, spec file cleanups.


Index: fftw.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw/FC-4/fftw.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fftw.spec	1 Feb 2006 20:53:21 -0000	1.11
+++ fftw.spec	13 Feb 2006 21:35:04 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fftw
 Version:        3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
@@ -41,25 +41,13 @@
 
 
 %build
+CONFIG_FLAGS="--enable-shared --disable-static --disable-dependency-tracking --enable-threads"
 pushd double
-	%ifarch i386
-		%configure \
-			--enable-shared \
-			--enable-threads \
-			--enable-i386-hacks
-	%else
-		%configure \
-			--enable-shared \
-			--enable-threads
-	%endif
+	%configure $CONFIG_FLAGS
 	make %{?_smp_mflags}
 popd
 pushd single
-	%configure \
-		--enable-shared \
-		--enable-type-prefix \
-		--enable-threads \
-		--enable-float
+	%configure $CONFIG_FLAGS --enable-single
 	make %{?_smp_mflags}
 popd
 
@@ -74,6 +62,7 @@
 pushd single
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 
 %clean
@@ -107,13 +96,15 @@
 %doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/
 %doc %{_infodir}/*.info*
 %exclude %{_libdir}/*.la
-%exclude %{_infodir}/dir
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
-%{_libdir}/*.a
 %{_libdir}/*.so
 
 %changelog
+* Mon Feb 13 2006 Quentin Spencer  3.1-2
+- Disable static libs.
+- Remove obsolete configure options.
+
 * Wed Feb  1 2006 Quentin Spencer  3.1-1
 - Upgrade to the 3.x branch, incorporating changes from the fftw3 spec file.
 - Add dist tag.



From fedora-extras-commits at redhat.com  Mon Feb 13 21:36:58 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:36:58 -0500
Subject: rpms/zoo import.log,1.5,1.6
Message-ID: <200602132137.k1DLbUvw030643@cvs-int.fedora.redhat.com>

Author: nim

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

Modified Files:
	import.log 
Log Message:
auto-import zoo-2.10-5.fc5 on branch devel from zoo-2.10-5.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zoo/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	16 Jan 2006 22:44:15 -0000	1.5
+++ import.log	13 Feb 2006 21:36:58 -0000	1.6
@@ -2,3 +2,4 @@
 zoo-2_10-0_fdr_2_1:HEAD:zoo-2.10-0.fdr.2.1.src.rpm:1099892207
 zoo-2_10-0_fdr_2_2:HEAD:zoo-2.10-0.fdr.2.2.src.rpm:1099892213
 zoo-2_10-4_fc5:HEAD:zoo-2.10-4.fc5.src.rpm:1137451445
+zoo-2_10-5_fc5:HEAD:zoo-2.10-5.fc5.src.rpm:1139866608



From fedora-extras-commits at redhat.com  Mon Feb 13 21:37:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:37:05 -0500
Subject: rpms/zoo/devel zoo.spec,1.7,1.8
Message-ID: <200602132137.k1DLbpaa030646@cvs-int.fedora.redhat.com>

Author: nim

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

Modified Files:
	zoo.spec 
Log Message:
auto-import zoo-2.10-5.fc5 on branch devel from zoo-2.10-5.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: zoo.spec
===================================================================
RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zoo.spec	16 Jan 2006 22:44:21 -0000	1.7
+++ zoo.spec	13 Feb 2006 21:37:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      zoo
 Version:   2.10
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   File archiving utility with compression
 
 Group:     Applications/Archiving
@@ -43,13 +43,16 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
-* Mon Jun 16 2006  Mailhot  - 2.10-4
+* Mon Feb 13 2006 Nicolas Mailhot  - 2.10-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jun 16 2005 Nicolas Mailhot  - 2.10-4
 - rebuild with gcc 4.1
 
 * Tue Apr 05 2005  Adrian Reber  - 2.10-3
 - fix gcc4 errors
 
-* Sun Apr 25 2004  Mailhot  - 0:2.10-0.fdr.2
+* Sun Apr 25 2004 Nicolas Mailhot  - 0:2.10-0.fdr.2
 * Use debian source
 
 * Tue Apr 20 2004 Nicolas Mailhot  - 0:2.10-0.fdr.1



From fedora-extras-commits at redhat.com  Mon Feb 13 21:41:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Feb 2006 16:41:18 -0500
Subject: rpms/Glide3-libGL/devel Glide3-libGL.spec,1.2,1.3
Message-ID: <200602132141.k1DLfb0W030729@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30710

Modified Files:
	Glide3-libGL.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  6.2.1-5
- Bump release and rebuild for new gcc4.1 and glibc.
- add %{?dist} for consistency with my other packages



Index: Glide3-libGL.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/Glide3-libGL.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Glide3-libGL.spec	16 Jan 2006 21:43:22 -0000	1.2
+++ Glide3-libGL.spec	13 Feb 2006 21:41:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           Glide3-libGL
 Version:        6.2.1
-Release:        4
+Release:        5%{?dist}
 Summary:        Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards
 Group:          System Environment/Libraries
 License:        MIT/X11
@@ -69,6 +69,10 @@
  
  
 %changelog
+* Mon Feb 13 2006 Hans de Goede  6.2.1-5
+- Bump release and rebuild for new gcc4.1 and glibc.
+- add %%{?dist} for consistency with my other packages
+
 * Mon Jan 16 2006 Hans de Goede  6.2.1-4
 - Add libGL-devel to BR, to work around a bug in the Mesa makefiles
   where it tries to link against libGL before it has build it.



From fedora-extras-commits at redhat.com  Mon Feb 13 21:41:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:41:38 -0500
Subject: rpms/perl-Net-Server import.log,1.7,1.8
Message-ID: <200602132142.k1DLgAd0030797@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30721

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.90-2.fc5 on branch devel from perl-Net-Server-0.90-2.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	8 Jan 2006 12:56:35 -0000	1.7
+++ import.log	13 Feb 2006 21:41:37 -0000	1.8
@@ -4,3 +4,4 @@
 perl-Net-Server-0_90-1_fc5:HEAD:perl-Net-Server-0.90-1.fc5.src.rpm:1136724741
 perl-Net-Server-0_90-1_fc4:FC-4:perl-Net-Server-0.90-1.fc4.src.rpm:1136724876
 perl-Net-Server-0_90-1_fc3:FC-3:perl-Net-Server-0.90-1.fc3.src.rpm:1136724984
+perl-Net-Server-0_90-2_fc5:HEAD:perl-Net-Server-0.90-2.fc5.src.rpm:1139866865



From fedora-extras-commits at redhat.com  Mon Feb 13 21:41:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:41:44 -0500
Subject: rpms/perl-Net-Server/devel perl-Net-Server.spec,1.10,1.11
Message-ID: <200602132142.k1DLgGYg030800@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30721/devel

Modified Files:
	perl-Net-Server.spec 
Log Message:
auto-import perl-Net-Server-0.90-2.fc5 on branch devel from perl-Net-Server-0.90-2.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Net-Server.spec	8 Jan 2006 12:52:38 -0000	1.10
+++ perl-Net-Server.spec	13 Feb 2006 21:41:43 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:    perl-%{rname}
 Version: 0.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Nicolas Mailhot  - 0.90-2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 8 2006 Nicolas Mailhot  - 0.90-1
 - Updated to 0.90
 - add IO::Multiplex dep



From fedora-extras-commits at redhat.com  Mon Feb 13 21:44:18 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 13 Feb 2006 16:44:18 -0500
Subject: rpms/freehdl import.log,1.3,1.4
Message-ID: <200602132144.k1DLipaD030899@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import freehdl-0.0.1-2 on branch FC-4 from freehdl-0.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freehdl/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	13 Feb 2006 18:28:24 -0000	1.3
+++ import.log	13 Feb 2006 21:44:18 -0000	1.4
@@ -1,2 +1,3 @@
 freehdl-0_0_1-1:HEAD:freehdl-0.0.1-1.src.rpm:1139650493
 freehdl-0_0_1-2:HEAD:freehdl-0.0.1-2.src.rpm:1139855294
+freehdl-0_0_1-2:FC-4:freehdl-0.0.1-2.src.rpm:1139867049



From fedora-extras-commits at redhat.com  Mon Feb 13 21:44:24 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 13 Feb 2006 16:44:24 -0500
Subject: rpms/freehdl/FC-4 freehdl.diff,NONE,1.1 freehdl.spec,1.1,1.2
Message-ID: <200602132144.k1DLiuKk030904@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	freehdl.spec 
Added Files:
	freehdl.diff 
Log Message:
auto-import freehdl-0.0.1-2 on branch FC-4 from freehdl-0.0.1-2.src.rpm

freehdl.diff:

--- NEW FILE freehdl.diff ---
--- freehdl-0.0.1/ieee/Makefile.in	2006-01-21 22:51:30.000000000 +0100
+++ freehdl-0.0.1/ieee/Makefile.in	2006-02-13 19:01:37.000000000 +0100
@@ -199,7 +199,7 @@
 SUFFIXES = .vhdl
 INCLUDES = -I $(top_srcdir) -I ..
 ieeedir = $(prefix)/share/freehdl/lib/ieee
-freehdllibdir = $(exec_prefix)/lib/freehdl
+freehdllibdir = $(libdir)/freehdl
 freehdllib_LTLIBRARIES = libieee.la
 libieee_la_SOURCES = std_logic_1164.cc numeric_std.cc numeric_bit.cc std_logic_signed.cc std_logic_unsigned.cc std_logic_arith.cc math_real.cc vital_timing.cc
 ieee_DATA = std_logic_1164.vhdl numeric_std.vhdl numeric_bit.vhdl std_logic_signed.vhdl std_logic_unsigned.vhdl std_logic_arith.vhdl math_real.vhdl vital_timing.vhdl


Index: freehdl.spec
===================================================================
RCS file: /cvs/extras/rpms/freehdl/FC-4/freehdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freehdl.spec	11 Feb 2006 09:35:07 -0000	1.1
+++ freehdl.spec	13 Feb 2006 21:44:24 -0000	1.2
@@ -1,10 +1,11 @@
 Summary: GPLed free VHDL
 Name: freehdl
 Version: 0.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 Source0: http://cran.mit.edu/~enaroska/%{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
@@ -15,6 +16,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -53,5 +55,8 @@
 %{_mandir}/man5/*
 
 %changelog
-* Mon Jan 23 2005 Eric Tanguy  0.0.1-1
+* Mon Feb 13 2006 Eric Tanguy  0.0.1-2
+- Add a patch for x86_64
+
+* Mon Jan 23 2006 Eric Tanguy  0.0.1-1
 - First build



From fedora-extras-commits at redhat.com  Mon Feb 13 21:45:43 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:45:43 -0500
Subject: rpms/perl-Font-TTF import.log,1.3,1.4
Message-ID: <200602132146.k1DLkFPa031027@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Font-TTF
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30967

Modified Files:
	import.log 
Log Message:
auto-import perl-Font-TTF-0.37-4.fc5 on branch devel from perl-Font-TTF-0.37-4.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Font-TTF/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 Feb 2006 22:17:46 -0000	1.3
+++ import.log	13 Feb 2006 21:45:43 -0000	1.4
@@ -1,2 +1,3 @@
 perl-Font-TTF-0_37-3_fc5:HEAD:perl-Font-TTF-0.37-3.fc5.src.rpm:1139164179
 perl-Font-TTF-0_37-3_fc4:FC-4:perl-Font-TTF-0.37-3.fc4.src.rpm:1139350656
+perl-Font-TTF-0_37-4_fc5:HEAD:perl-Font-TTF-0.37-4.fc5.src.rpm:1139867121



From fedora-extras-commits at redhat.com  Mon Feb 13 21:45:49 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:45:49 -0500
Subject: rpms/perl-Font-TTF/devel perl-Font-TTF.spec,1.1,1.2
Message-ID: <200602132146.k1DLkMNv031044@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Font-TTF/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30967/devel

Modified Files:
	perl-Font-TTF.spec 
Log Message:
auto-import perl-Font-TTF-0.37-4.fc5 on branch devel from perl-Font-TTF-0.37-4.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: perl-Font-TTF.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Font-TTF/devel/perl-Font-TTF.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Font-TTF.spec	5 Feb 2006 18:30:09 -0000	1.1
+++ perl-Font-TTF.spec	13 Feb 2006 21:45:49 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           perl-%{cpanname}
 Version:        0.37
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl library for modifying TTF font files
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Nicolas Mailhot  - 0.37-4
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb 5 2006 Nicolas Mailhot   - 0.37-3
 - spec cleanups #2
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:46:16 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 13 Feb 2006 16:46:16 -0500
Subject: rpms/freehdl import.log,1.4,1.5
Message-ID: <200602132146.k1DLkmFW031094@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import freehdl-0.0.1-2 on branch FC-3 from freehdl-0.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freehdl/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	13 Feb 2006 21:44:18 -0000	1.4
+++ import.log	13 Feb 2006 21:46:15 -0000	1.5
@@ -1,3 +1,4 @@
 freehdl-0_0_1-1:HEAD:freehdl-0.0.1-1.src.rpm:1139650493
 freehdl-0_0_1-2:HEAD:freehdl-0.0.1-2.src.rpm:1139855294
 freehdl-0_0_1-2:FC-4:freehdl-0.0.1-2.src.rpm:1139867049
+freehdl-0_0_1-2:FC-3:freehdl-0.0.1-2.src.rpm:1139867163



From fedora-extras-commits at redhat.com  Mon Feb 13 21:46:22 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 13 Feb 2006 16:46:22 -0500
Subject: rpms/freehdl/FC-3 freehdl.diff,NONE,1.1 freehdl.spec,1.1,1.2
Message-ID: <200602132146.k1DLkspj031101@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	freehdl.spec 
Added Files:
	freehdl.diff 
Log Message:
auto-import freehdl-0.0.1-2 on branch FC-3 from freehdl-0.0.1-2.src.rpm

freehdl.diff:

--- NEW FILE freehdl.diff ---
--- freehdl-0.0.1/ieee/Makefile.in	2006-01-21 22:51:30.000000000 +0100
+++ freehdl-0.0.1/ieee/Makefile.in	2006-02-13 19:01:37.000000000 +0100
@@ -199,7 +199,7 @@
 SUFFIXES = .vhdl
 INCLUDES = -I $(top_srcdir) -I ..
 ieeedir = $(prefix)/share/freehdl/lib/ieee
-freehdllibdir = $(exec_prefix)/lib/freehdl
+freehdllibdir = $(libdir)/freehdl
 freehdllib_LTLIBRARIES = libieee.la
 libieee_la_SOURCES = std_logic_1164.cc numeric_std.cc numeric_bit.cc std_logic_signed.cc std_logic_unsigned.cc std_logic_arith.cc math_real.cc vital_timing.cc
 ieee_DATA = std_logic_1164.vhdl numeric_std.vhdl numeric_bit.vhdl std_logic_signed.vhdl std_logic_unsigned.vhdl std_logic_arith.vhdl math_real.vhdl vital_timing.vhdl


Index: freehdl.spec
===================================================================
RCS file: /cvs/extras/rpms/freehdl/FC-3/freehdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freehdl.spec	11 Feb 2006 09:35:07 -0000	1.1
+++ freehdl.spec	13 Feb 2006 21:46:21 -0000	1.2
@@ -1,10 +1,11 @@
 Summary: GPLed free VHDL
 Name: freehdl
 Version: 0.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Engineering
 Source0: http://cran.mit.edu/~enaroska/%{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
@@ -15,6 +16,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -53,5 +55,8 @@
 %{_mandir}/man5/*
 
 %changelog
-* Mon Jan 23 2005 Eric Tanguy  0.0.1-1
+* Mon Feb 13 2006 Eric Tanguy  0.0.1-2
+- Add a patch for x86_64
+
+* Mon Jan 23 2006 Eric Tanguy  0.0.1-1
 - First build



From fedora-extras-commits at redhat.com  Mon Feb 13 21:49:55 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:49:55 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.9,1.10
Message-ID: <200602132150.k1DLoR4R031305@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31263

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-3.fc5 on branch devel from perl-Convert-UUlib-1.06-3.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	17 Jan 2006 20:56:23 -0000	1.9
+++ import.log	13 Feb 2006 21:49:55 -0000	1.10
@@ -6,3 +6,4 @@
 perl-Convert-UUlib-1_06-1_fc4:FC-4:perl-Convert-UUlib-1.06-1.fc4.src.rpm:1137452147
 perl-Convert-UUlib-1_06-2_fc5:HEAD:perl-Convert-UUlib-1.06-2.fc5.src.rpm:1137531201
 perl-Convert-UUlib-1_06-2_fc4:FC-4:perl-Convert-UUlib-1.06-2.fc4.src.rpm:1137531372
+perl-Convert-UUlib-1_06-3_fc5:HEAD:perl-Convert-UUlib-1.06-3.fc5.src.rpm:1139867384



From fedora-extras-commits at redhat.com  Mon Feb 13 21:50:01 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:50:01 -0500
Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.12,1.13
Message-ID: <200602132150.k1DLoXPZ031310@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31263/devel

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
auto-import perl-Convert-UUlib-1.06-3.fc5 on branch devel from perl-Convert-UUlib-1.06-3.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Convert-UUlib.spec	17 Jan 2006 20:53:38 -0000	1.12
+++ perl-Convert-UUlib.spec	13 Feb 2006 21:50:00 -0000	1.13
@@ -3,7 +3,7 @@
 Name:      perl-%{rname}
 Version:   1.06
 Epoch:     1
-Release:   2%{?dist}
+Release:   3%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Nicolas Mailhot  -1.06-3
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Nicolas Mailhot  1.06-2
 - bump epoch to force updates
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:50:38 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 13 Feb 2006 16:50:38 -0500
Subject: rpms/supertux/devel supertux-0.1.3-compile.patch, NONE,
	1.1 supertux.spec, 1.9, 1.10
Message-ID: <200602132151.k1DLpACE031367@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	supertux.spec 
Added Files:
	supertux-0.1.3-compile.patch 
Log Message:
Patch to fix compile on rawhide.

supertux-0.1.3-compile.patch:

--- NEW FILE supertux-0.1.3-compile.patch ---
--- src/menu.h.orig	2005-06-21 16:16:07.000000000 -0500
+++ src/menu.h	2006-02-07 13:23:05.000000000 -0600
@@ -207,7 +207,7 @@
 
   bool isToggled(int id);
 
-  void Menu::get_controlfield_key_into_input(MenuItem *item);
+  void get_controlfield_key_into_input(MenuItem *item);
 
   void draw   ();
   void draw_item(int index, int menu_width, int menu_height);


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- supertux.spec	6 Sep 2005 16:23:37 -0000	1.9
+++ supertux.spec	13 Feb 2006 21:50:37 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           supertux
 Version:        0.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Jump'n run like game similar to Mario Bros
 
@@ -8,6 +8,7 @@
 License:        GPL
 URL:            http://supertux.berlios.de/
 Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
+Patch0:         supertux-0.1.3-compile.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
@@ -23,7 +24,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 %build
 %configure --disable-debug
@@ -54,6 +55,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Feb 07 2006 Steven Pritchard  0.1.3-3
+- Patch to fix compile on rawhide
+
 * Tue Sep 06 2005 Steven Pritchard  0.1.3-2
 - Avoid second .desktop file (#167579)
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:53:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Feb 2006 16:53:33 -0500
Subject: rpms/scorched3d/devel scorched3d.spec,1.12,1.13
Message-ID: <200602132154.k1DLs5pE031474@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	scorched3d.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  - 39.1-4
- Bump release and rebuild for new gcc4.1 and glibc.



Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scorched3d.spec	12 Feb 2006 11:16:24 -0000	1.12
+++ scorched3d.spec	13 Feb 2006 21:53:33 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        39.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 
 Group:          Amusements/Games
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede  - 39.1-4
+- Bump release and rebuild for new gcc4.1 and glibc.
+
 * Sun Feb 12 2006  - 39.1-3
 - fix server crashing with certain landscape types (patch 13)
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:54:28 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:54:28 -0500
Subject: rpms/nomarch import.log,1.5,1.6
Message-ID: <200602132154.k1DLsxnG031566@cvs-int.fedora.redhat.com>

Author: nim

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

Modified Files:
	import.log 
Log Message:
auto-import nomarch-1.3-5.fc5 on branch devel from nomarch-1.3-5.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nomarch/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	16 Jan 2006 22:35:39 -0000	1.5
+++ import.log	13 Feb 2006 21:54:27 -0000	1.6
@@ -2,3 +2,4 @@
 nomarch-1_3-0_fdr_1_1:HEAD:nomarch-1.3-0.fdr.1.1.src.rpm:1099889721
 nomarch-1_3-0_fdr_1_2:HEAD:nomarch-1.3-0.fdr.1.2.src.rpm:1099889737
 nomarch-1_3-4_fc5:HEAD:nomarch-1.3-4.fc5.src.rpm:1137450929
+nomarch-1_3-5_fc5:HEAD:nomarch-1.3-5.fc5.src.rpm:1139867657



From fedora-extras-commits at redhat.com  Mon Feb 13 21:54:33 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 16:54:33 -0500
Subject: rpms/nomarch/devel nomarch.spec,1.8,1.9
Message-ID: <200602132155.k1DLt5Xu031569@cvs-int.fedora.redhat.com>

Author: nim

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

Modified Files:
	nomarch.spec 
Log Message:
auto-import nomarch-1.3-5.fc5 on branch devel from nomarch-1.3-5.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: nomarch.spec
===================================================================
RCS file: /cvs/extras/rpms/nomarch/devel/nomarch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nomarch.spec	16 Jan 2006 22:35:45 -0000	1.8
+++ nomarch.spec	13 Feb 2006 21:54:33 -0000	1.9
@@ -1,6 +1,6 @@
 Name:      nomarch
 Version:   1.3
-Release:   4%{?dist}
+Release:   5%{?dist}
 
 Summary:   GPLed Arc de-archiver
 
@@ -38,6 +38,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Feb 13 2006 Nicolas Mailhot  - 1.3-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Nicolas Mailhot  - 1.3-4
 - me is gcc4.1-proof
 



From fedora-extras-commits at redhat.com  Mon Feb 13 21:55:47 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 13 Feb 2006 16:55:47 -0500
Subject: rpms/qucs import.log,1.9,1.10
Message-ID: <200602132156.k1DLuKBa031648@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qucs/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	4 Nov 2005 22:36:11 -0000	1.9
+++ import.log	13 Feb 2006 21:55:47 -0000	1.10
@@ -6,3 +6,4 @@
 qucs-0_0_7-8:HEAD:qucs-0.0.7-8.src.rpm:1131143576
 qucs-0_0_7-8:FC-3:qucs-0.0.7-8.src.rpm:1131143675
 qucs-0_0_7-8:FC-4:qucs-0.0.7-8.src.rpm:1131143762
+qucs-0_0_8-1:HEAD:qucs-0.0.8-1.src.rpm:1139867738



From fedora-extras-commits at redhat.com  Mon Feb 13 21:55:53 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 13 Feb 2006 16:55:53 -0500
Subject: rpms/qucs/devel .cvsignore, 1.2, 1.3 qucs.spec, 1.4, 1.5 sources,
	1.2, 
	1.3 qucs-0.0.7-2.diff, 1.1, NONE qucs-0.0.7-config.diff, 1.1, NONE
Message-ID: <200602132156.k1DLuPVk031654@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	.cvsignore qucs.spec sources 
Removed Files:
	qucs-0.0.7-2.diff qucs-0.0.7-config.diff 
Log Message:
auto-import qucs-0.0.8-1 on branch devel from qucs-0.0.8-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 10:26:36 -0000	1.2
+++ .cvsignore	13 Feb 2006 21:55:53 -0000	1.3
@@ -1 +1 @@
-qucs-0.0.7.tar.gz
+qucs-0.0.8.tar.gz


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qucs.spec	4 Nov 2005 22:33:11 -0000	1.4
+++ qucs.spec	13 Feb 2006 21:55:53 -0000	1.5
@@ -1,18 +1,17 @@
 Summary:	Circuit simulator
 Name: 		qucs
-Version:	0.0.7
-Release: 	8%{?dist}
+Version:	0.0.8
+Release: 	1%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
-Patch0:		qucs-0.0.7-config.diff
-Patch1:		qucs-0.0.7-2.diff
+#Patch0:		qucs-gcc4.1.diff
 URL:		http://qucs.sourceforge.net/
 License:	GPL 
 Group: 		Applications/Engineering
 BuildRoot:    	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel
-
+Requires: freehdl
 
 
 %description
@@ -22,11 +21,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+%if "%{?fedora}" > "4"
+CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection"
+%endif
 %configure
 make %{?_smp_mflags}
 
@@ -54,6 +55,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* 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
+ 
 * Fri Nov 4 2005 Eric Tanguy  - 0.0.7-8
 - Modify ctaegories in qucs.desktop
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qucs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 10:26:36 -0000	1.2
+++ sources	13 Feb 2006 21:55:53 -0000	1.3
@@ -1 +1 @@
-87059c90cdb6e55b30c55ca72ad792b7  qucs-0.0.7.tar.gz
+0b280090e4b7ff390c6cc4458b3387a8  qucs-0.0.8.tar.gz


--- qucs-0.0.7-2.diff DELETED ---


--- qucs-0.0.7-config.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Feb 13 22:00:57 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 13 Feb 2006 17:00:57 -0500
Subject: rpms/krusader/devel .cvsignore, 1.3, 1.4 krusader.spec, 1.10,
	1.11 sources, 1.3, 1.4 krusader-1.60.0-desktop.patch, 1.2,
	NONE krusader-1.60.0-gcc4.patch, 1.1,
	NONE krusader-1.60.0-newline.patch, 1.1, NONE
Message-ID: <200602132201.k1DM1Tv7001112@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore krusader.spec sources 
Removed Files:
	krusader-1.60.0-desktop.patch krusader-1.60.0-gcc4.patch 
	krusader-1.60.0-newline.patch 
Log Message:
- Remove all patches (merged upstream)
- Updated to version 1.70.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Dec 2005 20:56:23 -0000	1.3
+++ .cvsignore	13 Feb 2006 22:00:56 -0000	1.4
@@ -1,2 +1 @@
-krusader-1.60.0.tar.gz
-krusader-1.60.1.tar.gz
+krusader-1.70.0.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- krusader.spec	16 Jan 2006 11:55:59 -0000	1.10
+++ krusader.spec	13 Feb 2006 22:00:56 -0000	1.11
@@ -1,21 +1,18 @@
 Name:		krusader
-Version:	1.60.1
-Release:	6%{?dist}
+Version:	1.70.0
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
 License:	GPL
 URL:		http://krusader.sourceforge.net/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		krusader-1.60.0-desktop.patch
-Patch1:		krusader-1.60.0-gcc4.patch
-Patch2:		krusader-1.60.0-newline.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs-devel >= 3.3.0 qt-devel >= 3.3.0 arts-devel >= 1.3.0
-BuildRequires:	kdebase-devel >= 3.3.0 kdebindings-devel >= 3.3.0 gamin-devel
-BuildRequires:	libXt-devel libpng-devel libselinux-devel libacl-devel
-BuildRequires:	automake desktop-file-utils gettext
+BuildRequires:	qt-devel kdelibs-devel kdebase-devel kdebindings-devel
+BuildRequires:	desktop-file-utils automake gettext
+BuildRequires:	arts-devel libpng-devel gamin-devel
+
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -35,9 +32,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -45,7 +39,8 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -55,7 +50,7 @@
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Applications/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/applnk/*.desktop
 
 # Workaround for some wicked install bug
 rm -rf $RPM_BUILD_ROOT%{_tmppath}
@@ -70,17 +65,27 @@
 %post
 update-desktop-database &> /dev/null ||:
 
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+
+touch --no-create %{_datadir}/icons/locolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
 fi
 
 %postun
 update-desktop-database &> /dev/null ||:
 
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+
+touch --no-create %{_datadir}/icons/locolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
 fi
 
 %clean
@@ -97,67 +102,72 @@
 %{_datadir}/apps/krusader/
 %{_datadir}/config/kio_isorc
 %{_datadir}/doc/HTML/en/krusader/
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/crystalsvg/*/apps/*
+%{_datadir}/icons/locolor/*/apps/*
 %{_mandir}/man1/krusader.1*
 %{_datadir}/services/iso.protocol
 %{_datadir}/services/krarc.protocol
 
 %changelog
-* Mon Jan 16 2006 Marcin Garski  1.60.1-6
+* Mon Feb 13 2006 Marcin Garski  1.70.0-1
+- Remove all patches (merged upstream)
+- Updated to version 1.70.0
+
+* Mon Jan 16 2006 Marcin Garski  1.60.1-6
 - Remove --enable-final
 
-* Mon Jan 16 2006 Marcin Garski  1.60.1-5
+* Mon Jan 16 2006 Marcin Garski  1.60.1-5
 - Remove --disable-dependency-tracking
 
-* Sun Jan 15 2006 Marcin Garski  1.60.1-4
+* Sun Jan 15 2006 Marcin Garski  1.60.1-4
 - Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
 - Add --disable-debug --disable-dependency-tracking & --enable-final
 
-* Wed Dec 14 2005 Marcin Garski  1.60.1-3
+* Wed Dec 14 2005 Marcin Garski  1.60.1-3
 - Add to BR libacl-devel
 
-* Tue Dec 13 2005 Marcin Garski  1.60.1-2
+* Tue Dec 13 2005 Marcin Garski  1.60.1-2
 - Fix for modular X.Org
 
-* Mon Dec 12 2005 Marcin Garski  1.60.1-1
+* Mon Dec 12 2005 Marcin Garski  1.60.1-1
 - Updated to version 1.60.1 which fix CVE-2005-3856
 
-* Sun Oct 23 2005 Marcin Garski  1.60.0-4
+* Sun Oct 23 2005 Marcin Garski  1.60.0-4
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 
-* Thu Aug 25 2005 Marcin Garski  1.60.0-3
+* Thu Aug 25 2005 Marcin Garski  1.60.0-3
 - Include .la files
 - Include actions_tutorial.txt
 - Fix krusader_root-mode.desktop file to show only in KDE and under System
   category
 - Fix compile warnings
 
-* Fri Aug 12 2005 Marcin Garski  1.60.0-2
+* Fri Aug 12 2005 Marcin Garski  1.60.0-2
 - Spec improvements for Fedora Extras
 
-* Wed Aug 10 2005 Marcin Garski  1.60.0-1
+* Wed Aug 10 2005 Marcin Garski  1.60.0-1
 - Updated to version 1.60.0 & clean up for Fedora Extras
 
-* Fri Dec 17 2004 Marcin Garski  1.51.fc2kde331
+* Fri Dec 17 2004 Marcin Garski  1.51.fc2kde331
 - Updated to version 1.51
 
-* Sat Nov 11 2004 Marcin Garski  1.50.fc2kde331
+* Sat Nov 11 2004 Marcin Garski  1.50.fc2kde331
 - Added Requires:
 
-* Tue Nov 02 2004 Marcin Garski  1.50.fc2
+* Tue Nov 02 2004 Marcin Garski  1.50.fc2
 - Updated to version 1.50 & spec cleanup
 
-* Fri Aug 06 2004 Marcin Garski  1.40-1.fc2
+* Fri Aug 06 2004 Marcin Garski  1.40-1.fc2
 - Updated to version 1.40
 
-* Wed Jun 23 2004 Marcin Garski  1.40-beta2.fc2
+* Wed Jun 23 2004 Marcin Garski  1.40-beta2.fc2
 - Updated to version 1.40-beta2
 
-* Wed Jun 02 2004 Marcin Garski  1.40-beta1.fc2
+* Wed Jun 02 2004 Marcin Garski  1.40-beta1.fc2
 - Rebuild for Fedora Core 2 & huge spec cleanup
 
-* Mon Nov 17 2003 11:05:00 Marian POPESCU  [1.30]
+* Mon Nov 17 2003 11:05:00 Marian POPESCU  [1.30]
 - Updated to 1.30 release + changed description to match the official one
 
-* Tue Jul 03 2003 17:00:00 Marcin Garski  [1.20]
+* Tue Jul 03 2003 17:00:00 Marcin Garski  [1.20]
 - Initial specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Dec 2005 20:56:23 -0000	1.3
+++ sources	13 Feb 2006 22:00:56 -0000	1.4
@@ -1,2 +1 @@
-95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
-18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz
+3c2d73637c72e1042fef52ad1a336a64  krusader-1.70.0.tar.gz


--- krusader-1.60.0-desktop.patch DELETED ---


--- krusader-1.60.0-gcc4.patch DELETED ---


--- krusader-1.60.0-newline.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Feb 13 22:03:22 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 17:03:22 -0500
Subject: rpms/lzop import.log,1.7,1.8
Message-ID: <200602132203.k1DM3sB9001216@cvs-int.fedora.redhat.com>

Author: nim

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

Modified Files:
	import.log 
Log Message:
auto-import lzop-1.02-0.2.fc5 on branch devel from lzop-1.02-0.2.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lzop/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	19 Jan 2006 20:33:55 -0000	1.7
+++ import.log	13 Feb 2006 22:03:21 -0000	1.8
@@ -4,3 +4,4 @@
 lzop-1_01-4_fc5:HEAD:lzop-1.01-4.fc5.src.rpm:1137542768
 lzop-1_02-0_1_fc5:HEAD:lzop-1.02-0.1.fc5.src.rpm:1137702711
 lzop-1_02-0_1_fc4:FC-4:lzop-1.02-0.1.fc4.src.rpm:1137702826
+lzop-1_02-0_2_fc5:HEAD:lzop-1.02-0.2.fc5.src.rpm:1139868172



From fedora-extras-commits at redhat.com  Mon Feb 13 22:03:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 17:03:44 -0500
Subject: rpms/lzop/devel lzop.spec,1.9,1.10
Message-ID: <200602132204.k1DM4GnN001219@cvs-int.fedora.redhat.com>

Author: nim

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

Modified Files:
	lzop.spec 
Log Message:
auto-import lzop-1.02-0.2.fc5 on branch devel from lzop-1.02-0.2.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lzop.spec	19 Jan 2006 20:32:09 -0000	1.9
+++ lzop.spec	13 Feb 2006 22:03:43 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name: lzop
 Version: 1.02
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 
 Summary: Real-time file compressor
 
@@ -43,6 +43,10 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Feb 13 2006 Nicolas Mailhot  - 1.02-0.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+- build with lzop 1 since lzop 2 hasn't been merged yet
+
 * Thu Jan 19 2006 Nicolas Mailhot  -  1.02-0.1
 - update to 1.02rc1
 - build with lzop 2



From fedora-extras-commits at redhat.com  Mon Feb 13 22:07:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 17:07:32 -0500
Subject: rpms/freeze/devel freeze.spec,1.8,1.9
Message-ID: <200602132208.k1DM85sj001312@cvs-int.fedora.redhat.com>

Author: nim

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

Modified Files:
	freeze.spec 
Log Message:
auto-import freeze-2.5.0-6.fc5 on branch devel from freeze-2.5.0-6.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: freeze.spec
===================================================================
RCS file: /cvs/extras/rpms/freeze/devel/freeze.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- freeze.spec	16 Jan 2006 21:51:44 -0000	1.8
+++ freeze.spec	13 Feb 2006 22:07:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:    freeze
 Version: 2.5.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: freeze/melt/fcat compression utilities
 
 Group:     Applications/Archiving
@@ -52,6 +52,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Feb 13 2006 Nicolas Mailhot  - 2.10-6
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 26 2006 Nicolas Mailhot  2.5.0-5
 - rebuild with gcc 4.1
 



From fedora-extras-commits at redhat.com  Mon Feb 13 22:07:25 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 17:07:25 -0500
Subject: rpms/freeze import.log,1.5,1.6
Message-ID: <200602132208.k1DM8Uvq001315@cvs-int.fedora.redhat.com>

Author: nim

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

Modified Files:
	import.log 
Log Message:
auto-import freeze-2.5.0-6.fc5 on branch devel from freeze-2.5.0-6.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freeze/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	16 Jan 2006 21:51:38 -0000	1.5
+++ import.log	13 Feb 2006 22:07:24 -0000	1.6
@@ -2,3 +2,4 @@
 freeze-2_5_0-0_fdr_1_1:HEAD:freeze-2.5.0-0.fdr.1.1.src.rpm:1099887635
 freeze-2_5_0-0_fdr_1_2:HEAD:freeze-2.5.0-0.fdr.1.2.src.rpm:1099887641
 freeze-2_5_0-5_fc5:HEAD:freeze-2.5.0-5.fc5.src.rpm:1137448288
+freeze-2_5_0-6_fc5:HEAD:freeze-2.5.0-6.fc5.src.rpm:1139868423



From fedora-extras-commits at redhat.com  Mon Feb 13 22:11:22 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 17:11:22 -0500
Subject: rpms/dejavu-fonts import.log,1.33,1.34
Message-ID: <200602132211.k1DMBsoQ001467@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1415

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-6.fc5 on branch devel from dejavu-fonts-2.2-6.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- import.log	12 Feb 2006 21:29:27 -0000	1.33
+++ import.log	13 Feb 2006 22:11:21 -0000	1.34
@@ -30,3 +30,4 @@
 dejavu-fonts-2_2-4_fc5:HEAD:dejavu-fonts-2.2-4.fc5.src.rpm:1139753973
 dejavu-fonts-2_2-5_fs5:HEAD:dejavu-fonts-2.2-5.fs5.src.rpm:1139779591
 dejavu-fonts-2_2-5_fc5:HEAD:dejavu-fonts-2.2-5.fc5.src.rpm:1139779757
+dejavu-fonts-2_2-6_fc5:HEAD:dejavu-fonts-2.2-6.fc5.src.rpm:1139868667



From fedora-extras-commits at redhat.com  Mon Feb 13 22:11:28 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 13 Feb 2006 17:11:28 -0500
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.12,1.13
Message-ID: <200602132212.k1DMC0vO001470@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1415/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-6.fc5 on branch devel from dejavu-fonts-2.2-6.fc5.src.rpm
rebuilt for new gcc4.1 snapshot and glibc changes


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dejavu-fonts.spec	12 Feb 2006 21:26:47 -0000	1.12
+++ dejavu-fonts.spec	13 Feb 2006 22:11:27 -0000	1.13
@@ -7,7 +7,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -77,6 +77,9 @@
 %{fontdir}/*.ttf
 
 %changelog
+* Mon Feb 13 2006 Nicolas Mailhot  - 2.2-6
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb 12 2006 Nicolas Mailhot  2.2-5
 - downgrade fontforge requirement following bug #181052 resolution
 



From fedora-extras-commits at redhat.com  Mon Feb 13 22:11:29 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 13 Feb 2006 17:11:29 -0500
Subject: rpms/net6/devel net6.spec,1.6,1.7
Message-ID: <200602132212.k1DMC2VO001475@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	net6.spec 
Log Message:
rebuild


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- net6.spec	22 Dec 2005 08:53:09 -0000	1.6
+++ net6.spec	13 Feb 2006 22:11:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           net6
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Luke Macken  - 1.2.2-2
+- Rebuild
+
 * Thu Dec 22 2005 Luke Macken  - 1.2.2-1
 - 1.2.2
 



From fedora-extras-commits at redhat.com  Mon Feb 13 22:13:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 13 Feb 2006 17:13:06 -0500
Subject: rpms/pork/devel pork.spec,1.3,1.4
Message-ID: <200602132213.k1DMD8Wd001591@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	pork.spec 
Log Message:
Rebuild for FE5


Index: pork.spec
===================================================================
RCS file: /cvs/extras/rpms/pork/devel/pork.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pork.spec	27 Dec 2005 17:43:04 -0000	1.3
+++ pork.spec	13 Feb 2006 22:13:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pork
 Version:        0.99.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Console based AIM client that looks like ircII
 
 Group:          Applications/Internet
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Feb 13 2005 Luke Macken  - 0.99.8.1-5
+- Rebuild for FE5
+
 * Tue Dec 27 2005 Luke Macken  - 0.99.8.1-4
 - Rebuild
 



From fedora-extras-commits at redhat.com  Mon Feb 13 22:13:40 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 13 Feb 2006 17:13:40 -0500
Subject: rpms/pork/devel pork.spec,1.4,1.5
Message-ID: <200602132214.k1DMEDPA001682@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	pork.spec 
Log Message:
typo in changelog


Index: pork.spec
===================================================================
RCS file: /cvs/extras/rpms/pork/devel/pork.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pork.spec	13 Feb 2006 22:13:06 -0000	1.4
+++ pork.spec	13 Feb 2006 22:13:40 -0000	1.5
@@ -52,7 +52,7 @@
 
 
 %changelog
-* Mon Feb 13 2005 Luke Macken  - 0.99.8.1-5
+* Mon Feb 13 2006 Luke Macken  - 0.99.8.1-5
 - Rebuild for FE5
 
 * Tue Dec 27 2005 Luke Macken  - 0.99.8.1-4



From fedora-extras-commits at redhat.com  Mon Feb 13 22:16:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Feb 2006 17:16:44 -0500
Subject: rpms/pcsc-lite/devel pcsc-lite-1.2.0-rpath64.patch, NONE,
	1.1 pcsc-lite.spec, 1.6, 1.7
Message-ID: <200602132217.k1DMHGWR001820@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1796

Modified Files:
	pcsc-lite.spec 
Added Files:
	pcsc-lite-1.2.0-rpath64.patch 
Log Message:
* Mon Feb 13 2006 Ville Skytt??  - 1.2.0-14
- Avoid standard rpaths on multilib archs.
- Fine tune dependencies.


pcsc-lite-1.2.0-rpath64.patch:

--- NEW FILE pcsc-lite-1.2.0-rpath64.patch ---
--- pcsc-lite-1.2.0/configure~	2003-10-28 00:46:54.000000000 +0200
+++ pcsc-lite-1.2.0/configure	2006-02-14 00:05:39.000000000 +0200
@@ -8918,7 +8918,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
@@ -12514,7 +12514,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
@@ -15559,7 +15559,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
@@ -17890,7 +17890,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
--- pcsc-lite-1.2.0/aclocal.m4~	2003-10-28 00:46:49.000000000 +0200
+++ pcsc-lite-1.2.0/aclocal.m4	2006-02-14 00:03:43.000000000 +0200
@@ -2600,7 +2600,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pcsc-lite.spec	11 Nov 2005 16:46:07 -0000	1.6
+++ pcsc-lite.spec	13 Feb 2006 22:16:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.2.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -10,12 +10,14 @@
 Source1:        %{name}-pcscd.init
 Source2:        %{name}-update-reader.conf
 Patch0:         %{name}-docinst.patch
+Patch1:         %{name}-1.2.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
 BuildRequires:  flex
 BuildRequires:  libusb-devel >= 0.1.6
-Requires:       chkconfig
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
 Requires:       pcsc-ifd-handler
 
 %description
@@ -51,6 +53,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 %{__perl} -pi -e 's|/etc/init\.d\b|%{_initrddir}|' doc/pcscd.8.in
 %{__perl} -pe \
   's|__LOCALSTATEDIR__|%{_localstatedir}|g ;
@@ -109,6 +112,7 @@
 [ $1 -gt 0 ] && %{_initrddir}/pcscd try-restart >/dev/null || :
 
 %post libs -p /sbin/ldconfig
+
 %postun libs -p /sbin/ldconfig
 
 
@@ -140,6 +144,10 @@
 
 
 %changelog
+* Mon Feb 13 2006 Ville Skytt??  - 1.2.0-14
+- Avoid standard rpaths on multilib archs.
+- Fine tune dependencies.
+
 * Fri Nov 11 2005 Ville Skytt??  - 1.2.0-13
 - Don't ship static libraries.
 - Don't mark the init script as a config file.



From fedora-extras-commits at redhat.com  Mon Feb 13 23:59:04 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 13 Feb 2006 18:59:04 -0500
Subject: rpms/python-irclib/devel python-irclib.spec,1.1,1.2
Message-ID: <200602132359.k1DNxaUN004619@cvs-int.fedora.redhat.com>

Author: lmacken

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

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


Index: python-irclib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-irclib/devel/python-irclib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-irclib.spec	26 Jun 2005 18:34:33 -0000	1.1
+++ python-irclib.spec	13 Feb 2006 23:59:03 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: python-irclib
 Version: 0.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A set of Python modules for IRC support
 
 Group: Development/Libraries
@@ -40,5 +40,8 @@
 %{python_sitelib}/*.py*
 
 %changelog
+* Mon Feb 13 2006 Luke Macken  0.4.5-2
+- Rebuild
+
 * Wed Jun 22 2005 Luke Macken  0.4.5-1
 - Packaged for Fedora Extras



From fedora-extras-commits at redhat.com  Tue Feb 14 00:00:52 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 13 Feb 2006 19:00:52 -0500
Subject: rpms/xprobe2/devel xprobe2.spec,1.4,1.5
Message-ID: <200602140001.k1E01OHO006443@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	xprobe2.spec 
Log Message:
rebuild for fe5


Index: xprobe2.spec
===================================================================
RCS file: /cvs/extras/rpms/xprobe2/devel/xprobe2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xprobe2.spec	27 Dec 2005 17:45:21 -0000	1.4
+++ xprobe2.spec	14 Feb 2006 00:00:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xprobe2
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Xprobe2 is an active operating system fingerprinting tool
 
 Group:          Applications/Internet
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Luke Macken  0.3-5
+- Rebuild for FE5
+
 * Tue Dec 27 2005 Luke Macken  0.3-4
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb 14 00:12:38 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 13 Feb 2006 19:12:38 -0500
Subject: rpms/gquilt/devel .cvsignore, 1.7, 1.8 gquilt.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <200602140013.k1E0DMTT006580@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Jan 2006 04:24:04 -0000	1.7
+++ .cvsignore	14 Feb 2006 00:12:38 -0000	1.8
@@ -1 +1 @@
-gquilt-0.16.tar.gz
+gquilt-0.17.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/gquilt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gquilt.spec	29 Jan 2006 04:24:04 -0000	1.6
+++ gquilt.spec	14 Feb 2006 00:12:38 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.16
+Version:	0.17
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Mon Feb 13 2006 Josh Boyer  0.17-1
+- Update to latest release
+
 * Sat Jan 28 2006 Josh Boyer  0.16-1
 - Update to latest release
 - Require pygtk2 >= 2.6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Jan 2006 04:24:04 -0000	1.7
+++ sources	14 Feb 2006 00:12:38 -0000	1.8
@@ -1 +1 @@
-4d1b5e44130b0a55f8ec25f22780b272  gquilt-0.16.tar.gz
+0f7971cec2ad1175162bb3d70b5aa8b0  gquilt-0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 00:12:19 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 13 Feb 2006 19:12:19 -0500
Subject: rpms/gquilt/FC-4 .cvsignore, 1.7, 1.8 gquilt.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <200602140013.k1E0DjAc006585@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Jan 2006 04:25:53 -0000	1.7
+++ .cvsignore	14 Feb 2006 00:12:18 -0000	1.8
@@ -1 +1 @@
-gquilt-0.16.tar.gz
+gquilt-0.17.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/gquilt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gquilt.spec	29 Jan 2006 04:25:53 -0000	1.6
+++ gquilt.spec	14 Feb 2006 00:12:19 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.16
+Version:	0.17
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Mon Feb 13 2006 Josh Boyer  0.17-1
+- Update to latest release
+
 * Sat Jan 28 2006 Josh Boyer  0.16-1
 - Update to latest release
 - Require pygtk2 >= 2.6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Jan 2006 04:25:53 -0000	1.7
+++ sources	14 Feb 2006 00:12:19 -0000	1.8
@@ -1 +1 @@
-4d1b5e44130b0a55f8ec25f22780b272  gquilt-0.16.tar.gz
+0f7971cec2ad1175162bb3d70b5aa8b0  gquilt-0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 01:19:57 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Mon, 13 Feb 2006 20:19:57 -0500
Subject: rpms/mmv/devel mmv-1.01b-debian-14.patch, NONE, 1.1 changelog, 1.1, 
	1.2 mmv.spec, 1.3, 1.4
Message-ID: <200602140120.k1E1KUJE008711@cvs-int.fedora.redhat.com>

Author: shishz

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

Modified Files:
	changelog mmv.spec 
Added Files:
	mmv-1.01b-debian-14.patch 
Log Message:
* Mon Feb 13 2006 Zing  - 1.01b-5
- sync with debian mmv_1.01b-14
- symlink man page for mcp/mad/mln


mmv-1.01b-debian-14.patch:

--- NEW FILE mmv-1.01b-debian-14.patch ---
--- mmv-1.01b.orig/mmv.c.orig	2006-02-13 19:07:32.000000000 -0500
+++ mmv-1.01b.orig/mmv.c	2006-02-13 19:11:34.000000000 -0500
@@ -439,7 +439,9 @@
 static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad;
 static FILE *outfile;
 
+#ifdef IS_MSDOS
 static char IDF[] = "$$mmvdid.";
+#endif
 static char TEMP[] = "$$mmvtmp.";
 static char TOOLONG[] = "(too long)";
 static char EMPTY[] = "(empty)";
@@ -457,12 +459,12 @@
 char fullrep[MAXPATH + 1];
 static char *(start[MAXWILD]);
 static int len[MAXWILD];
-static char hasdot[MAXWILD];
 static REP mistake;
 #define MISTAKE (&mistake)
 
 #ifdef IS_MSDOS
 
+static char hasdot[MAXWILD];
 static int olddevflag, curdisk, maxdisk;
 static struct {
 	char ph_banner[30];
@@ -627,7 +629,7 @@
 		}
 
 endargs:
-	if (op == DFLT)
+	if (op == DFLT) {
 		if (strcmp(cmdname, MOVENAME) == 0)
 			op = XMOVE;
 		else if (strcmp(cmdname, COPYNAME) == 0)
@@ -638,6 +640,8 @@
 			op = HARDLINK;
 		else
 			op = DFLTOP;
+	}
+	
 	if (
 		op & DIRMOVE &&
 #ifdef IS_MSDOS
@@ -784,7 +788,7 @@
 static int parsepat()
 {
 	char *p, *lastname, c;
-	int totwilds, instage, x, havedot;
+	int totwilds, instage, x;
 	static char TRAILESC[] = "%s -> %s : trailing %c is superfluous.\n";
 
 	lastname = from;
@@ -1047,7 +1051,7 @@
 	DIRINFO *di;
 	HANDLE *h, *hto;
 	int prelen, litlen, nfils, i, k, flags, try;
-	FILEINFO **pf, *fdel;
+	FILEINFO **pf, *fdel = NULL;
 	char *nto, *firstesc;
 	REP *p;
 	int wantdirs, ret = 1, laststage = (stage + 1 == nstages);
@@ -1177,11 +1181,12 @@
 	if (*p == '.' || (!matchall && ffrom->fi_attrib & (FA_HIDDEN | FA_SYSTEM)))
 		return(strcmp(pat, p) == 0);
 #else
-	if (*p == '.')
+	if (*p == '.') {
 		if (p[1] == '\0' || (p[1] == '.' && p[2] == '\0'))
 			return(strcmp(pat, p) == 0);
 		else if (!matchall && *pat != '.')
 			return(0);
+	}
 #endif
 	return(-1);
 }
@@ -1317,7 +1322,7 @@
 {
 	char tpath[MAXPATH + 1];
 	char *pathend;
-	FILEINFO *fdel;
+	FILEINFO *fdel = NULL;
 	int hlen, tlen;
 
 	if (op & DIRMOVE) {
@@ -1410,7 +1415,9 @@
 static int badname(s)
 	char *s;
 {
+#ifdef IS_MSDOS
 	char *ext;
+#endif
 
 	return (
 #ifdef IS_MSDOS
@@ -1720,20 +1727,19 @@
 	struct stat dstat;
 	DIRID d;
 	DEVID v;
-	DIRINFO **newdirs, *di;
-	int nfils;
-	FILEINFO **fils;
+	DIRINFO *di = NULL;
 	char *myp, *lastslash = NULL;
 	int sticky;
 	HANDLE *h;
 
-	if (hsearch(p, which, &h))
+	if (hsearch(p, which, &h)) {
 		if (h->h_di == NULL) {
 			direrr = h->h_err;
 			return(NULL);
 		}
 		else
 			return(h);
+	}
 
 	if (*p == '\0')
 		myp = ".";
@@ -1904,7 +1910,10 @@
 	char *pat, *s, **start1;
 	int *len1;
 {
-	char c, *olds;
+	char c;
+#ifdef IS_MSDOS
+	char *olds;
+#endif
 
 	*start1 = 0;
 	for(;;)
@@ -2381,9 +2390,9 @@
 static void doreps()
 {
 	char *fstart;
-	int k, printaliased = 0, alias;
+	int k, printaliased = 0, alias = 0;
 	REP *first, *p;
-	long aliaslen;
+	long aliaslen = 0l;
 
 #ifdef IS_MSDOS
 	ctrlbrk(breakrep);
@@ -2401,11 +2410,12 @@
 			}
 			strcpy(fullrep, p->r_hto->h_name);
 			strcat(fullrep, p->r_nto);
-			if (!noex && (p->r_flags & R_ISCYCLE))
+			if (!noex && (p->r_flags & R_ISCYCLE)) {
 				if (op & APPEND)
 					aliaslen = appendalias(first, p, &printaliased);
 				else
 					alias = movealias(first, p, &printaliased);
+			}
 			strcpy(pathbuf, p->r_hfrom->h_name);
 			fstart = pathbuf + strlen(pathbuf);
 			if ((p->r_flags & R_ISALIASED) && !(op & APPEND))
@@ -2464,7 +2474,7 @@
 	REP *first, *p;
 	int *pprintaliased;
 {
-	long ret;
+	long ret = 0l;
 
 #ifdef IS_MSDOS
 	int fd;
@@ -2631,9 +2641,10 @@
 	FILEINFO *ff;
 	off_t len;
 {
-	char buf[BUFSIZE], c;
+	char buf[BUFSIZE];
 	int f, t, k, mode, perm;
 #ifdef IS_MSDOS
+        char c;
 	struct ftime tim;
 #else
 #ifdef IS_SYSV


Index: changelog
===================================================================
RCS file: /cvs/extras/rpms/mmv/devel/changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changelog	30 Sep 2005 00:40:20 -0000	1.1
+++ changelog	14 Feb 2006 01:19:57 -0000	1.2
@@ -1,3 +1,18 @@
+mmv (1.01b-14) unstable; urgency=low
+
+  * Thanks for NMU to Joey, Ai and Uwe
+  * applied Patch to initialize var (Closes: Bug #316363)
+  * removed 2 dozent GCC warnings (uninitialized, unused, ambiquous else)
+
+ -- Bernd Eckenfels   Sat, 04 Feb 2006 23:58:43 +0100
+
+mmv (1.01b-12.3) unstable; urgency=low
+
+  * NMU
+  * Remove postinst and prerm, finishing /usr/doc transition. Closes: #322813
+
+ -- Joey Hess   Tue, 10 Jan 2006 00:54:51 -0500
+
 mmv (1.01b-12.2) unstable; urgency=low
 
   * NMU


Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/devel/mmv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mmv.spec	1 Oct 2005 23:22:17 -0000	1.3
+++ mmv.spec	14 Feb 2006 01:19:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -11,6 +11,7 @@
 Source2:	changelog
 Patch0:		mmv-1.01b-debian.patch
 Patch1:		mmv-1.01b-makefile.patch
+Patch2:		mmv-1.01b-debian-14.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q -n mmv-1.01b.orig
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp -p %{SOURCE1} . 
 cp -p %{SOURCE2} .
 
@@ -39,6 +41,9 @@
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mcp
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mad
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mln
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mcp.1.gz
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mad.1.gz
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mln.1.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,6 +58,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 13 2006 Zing  - 1.01b-5
+- sync with debian mmv_1.01b-14
+- symlink man page for mcp/mad/mln
+
 * Sat Oct  1 2005 Zing  - 1.01b-4
 - use dist tag
 



From fedora-extras-commits at redhat.com  Tue Feb 14 04:23:06 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Mon, 13 Feb 2006 23:23:06 -0500
Subject: rpms/feh/devel feh.spec,1.7,1.8
Message-ID: <200602140423.k1E4Ndq0015279@cvs-int.fedora.redhat.com>

Author: dragoon

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

Modified Files:
	feh.spec 
Log Message:
* Mon Feb 13 2006 Aaron Kurtz  - 1.3.4-3
- Rebuild for Fedora Extras 5



Index: feh.spec
===================================================================
RCS file: /cvs/extras/rpms/feh/devel/feh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- feh.spec	31 Jan 2006 09:28:25 -0000	1.7
+++ feh.spec	14 Feb 2006 04:23:06 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:         	feh 
 Version:        1.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fast command line image viewer using Imlib2
 
 Group:          Applications/Multimedia
@@ -48,6 +48,9 @@
 %{_mandir}/man[^3]/*
 
 %changelog
+* Mon Feb 13 2006 Aaron Kurtz  - 1.3.4-3
+- Rebuild for Fedora Extras 5
+
 * Tue Jan 31 2006 Aaron Kurtz  - 1.3.4-2
 - change to new modular X devel BuildReqs
 



From fedora-extras-commits at redhat.com  Tue Feb 14 04:23:15 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Mon, 13 Feb 2006 23:23:15 -0500
Subject: rpms/gnome-applet-netspeed/devel gnome-applet-netspeed.spec, 1.7,
	1.8
Message-ID: <200602140423.k1E4Nl43015282@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-netspeed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262

Modified Files:
	gnome-applet-netspeed.spec 
Log Message:
* Mon Feb 13 2006 Aaron Kurtz  - 0.13-5
- Rebuild for Fedora Extras 5



Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-applet-netspeed.spec	9 Jan 2006 22:51:29 -0000	1.7
+++ gnome-applet-netspeed.spec	14 Feb 2006 04:23:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name: gnome-applet-netspeed    
 Version: 0.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: GNOME applet that shows traffic on a network device
 
 Group: Applications/Internet
@@ -53,6 +53,9 @@
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Mon Feb 13 2006 Aaron Kurtz  - 0.13-5
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 09 2006 Aaron Kurtz  - 0.13-4
 -Proper soname rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb 14 04:25:15 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Mon, 13 Feb 2006 23:25:15 -0500
Subject: rpms/gnome-applet-sensors/devel gnome-applet-sensors.spec,1.6,1.7
Message-ID: <200602140425.k1E4PmnA015369@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-sensors/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15293

Modified Files:
	gnome-applet-sensors.spec 
Log Message:
* Mon Feb 13 2006 Aaron Kurtz  - 1.6-3
- Rebuild for Fedora Extras 5



Index: gnome-applet-sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/gnome-applet-sensors.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-sensors.spec	12 Feb 2006 18:09:21 -0000	1.6
+++ gnome-applet-sensors.spec	14 Feb 2006 04:25:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-applet-sensors
 Version:        1.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 
 Group:          User Interface/Desktops
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Aaron Kurtz  - 1.6-3
+- Rebuild for Fedora Extras 5
+
 * Sat Feb 11 2006 Aaron Kurtz  - 1.6-2
 - fix gnome-doc-utils requirement
 



From fedora-extras-commits at redhat.com  Tue Feb 14 04:46:19 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 13 Feb 2006 23:46:19 -0500
Subject: rpms/azureus/devel azureus-no-updates-PluginInterfaceImpl.patch, 1.1,
	1.2 azureus.spec, 1.17, 1.18
Message-ID: <200602140446.k1E4kqGm015557@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	azureus-no-updates-PluginInterfaceImpl.patch azureus.spec 
Log Message:
Fix patch by removing absolute path.


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-updates-PluginInterfaceImpl.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-updates-PluginInterfaceImpl.patch	14 Feb 2006 04:46:19 -0000	1.2
@@ -1,5 +1,5 @@
---- /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig	2006-02-09 23:03:10.000000000 -0500
-+++ /usr/src/redhat/BUILD/azureus2/org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java	2006-02-09 23:03:41.000000000 -0500
+--- 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 @@
  import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository;
  import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl;


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- azureus.spec	10 Feb 2006 17:00:46 -0000	1.17
+++ azureus.spec	14 Feb 2006 04:46:19 -0000	1.18
@@ -199,6 +199,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Feb 13 2006 Anthony Green  - 2.4.0.0-0.20060207cvs_1
+- Remove absolute path from azureus-no-updates-PluginInterfaceImpl.patch.
+
 * Fri Feb 10 2006 Anthony Green  - 2.4.0.0-0.20060207cvs
 - Update cvs sources.  Boost version number.
 - Move all jar files to /usr/share/azureus.



From fedora-extras-commits at redhat.com  Tue Feb 14 04:48:03 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 13 Feb 2006 23:48:03 -0500
Subject: rpms/azureus/devel azureus.spec,1.18,1.19
Message-ID: <200602140448.k1E4maeL015613@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	azureus.spec 
Log Message:
Fix release number.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- azureus.spec	14 Feb 2006 04:46:19 -0000	1.18
+++ azureus.spec	14 Feb 2006 04:48:03 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.4.0.0
-Release:        0.20060209cvs%{?dist}
+Release:        0.20060209cvs_1%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:20 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:20 -0500
Subject: rpms/edb/devel edb.spec,1.11,1.12
Message-ID: <200602140503.k1E53qT6017948@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	edb.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: edb.spec
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/edb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- edb.spec	16 Oct 2005 00:25:40 -0000	1.11
+++ edb.spec	14 Feb 2006 05:00:20 -0000	1.12
@@ -1,13 +1,12 @@
 Name:           edb
-Version:        1.0.5.004
+Version:        1.0.5.005
 Release:        1%{?dist}
 
 Summary:        A database convenience library wrapped around BDB
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://enlightenment.org/index.php?id=23
-# http://enlightenment.freedesktop.org/fetch.php?file=%{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel, ncurses-devel zlib-devel which
 Requires(post): /sbin/ldconfig
@@ -85,6 +84,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.0.5.005-1
+- Upstream update
+
 * Sat Oct 15 2005 Ignacio Vazquez-Abrams  1.0.5.004-1
 - Upstream update
 - Disabled static libraries



From fedora-extras-commits at redhat.com  Tue Feb 14 05:03:23 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:03:23 -0500
Subject: rpms/wp_tray/devel wp_tray.spec,1.2,1.3
Message-ID: <200602140503.k1E53tRZ017951@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	wp_tray.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: wp_tray.spec
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/devel/wp_tray.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wp_tray.spec	22 Jan 2006 15:46:52 -0000	1.2
+++ wp_tray.spec	14 Feb 2006 05:03:23 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           wp_tray
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A wallpaper-changing applet for GNOME
 
 Group:          Amusements/Graphics
@@ -64,6 +64,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.5.1-2
+- Rebuild for Fedora Extras 5
+
 * Tue Jan 17 2006 Ignacio Vazquez-Abrams  0.5.1-1
 - Upstream update
 - Merge Chris Chabot's spec file changes



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:49 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:49 -0500
Subject: rpms/ghasher/devel ghasher.spec,1.9,1.10
Message-ID: <200602140503.k1E53x0F017954@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	ghasher.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: ghasher.spec
===================================================================
RCS file: /cvs/extras/rpms/ghasher/devel/ghasher.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ghasher.spec	10 Nov 2005 12:27:12 -0000	1.9
+++ ghasher.spec	14 Feb 2006 05:00:49 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
@@ -55,6 +55,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.2.0-8
+- Rebuild for Fedora Extras 5
+
 * Thu Nov 10 2005 Ignacio Vazquez-Abrams  1.2.0-7
 - Rebuild for new OpenSSL
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:03 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:03 -0500
Subject: rpms/alltray/devel alltray.spec,1.5,1.6
Message-ID: <200602140504.k1E54Aqa017963@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	alltray.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alltray.spec	27 Jan 2006 10:10:11 -0000	1.5
+++ alltray.spec	14 Feb 2006 05:00:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           alltray
 Version:        0.65
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dock any application in the tray
 
 Group:          User Interface/Desktops
@@ -52,6 +52,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.65-2
+- Rebuild for Fedora Extras 5
+
 * Thu Jan 27 2006 Ignacio Vazquez-Abrams  0.65-1
 - Added -fPIC to CFLAGS
 - Added preload patch



From fedora-extras-commits at redhat.com  Tue Feb 14 05:02:30 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:02:30 -0500
Subject: rpms/notecase/devel notecase.spec,1.15,1.16
Message-ID: <200602140504.k1E54AxJ017961@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	notecase.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- notecase.spec	4 Feb 2006 09:13:12 -0000	1.15
+++ notecase.spec	14 Feb 2006 05:02:29 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           notecase
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
@@ -70,6 +70,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.1.4-2
+- Rebuild for Fedora Extras 5
+
 * Sat Feb  4 2006 Ignacio Vazquez-Abrams  1.1.4-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:26 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:26 -0500
Subject: rpms/eet/devel eet.spec,1.6,1.7
Message-ID: <200602140504.k1E54Ada017962@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	eet.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: eet.spec
===================================================================
RCS file: /cvs/extras/rpms/eet/devel/eet.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eet.spec	3 Feb 2006 05:34:15 -0000	1.6
+++ eet.spec	14 Feb 2006 05:00:26 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           eet
 Version:        0.9.10.023
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library designed to write an arbitary set of chunks of data to a file
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/pkgconfig/eet.pc
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.9.10.023-2
+- Rebuild for Fedora Extras 5
+
 * Fri Feb  3 2006 Ignacio Vazquez-Abrams  0.9.10.023-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:02:03 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:02:03 -0500
Subject: rpms/mimetex/devel mimetex.spec,1.2,1.3
Message-ID: <200602140504.k1E54BcQ017974@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	mimetex.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: mimetex.spec
===================================================================
RCS file: /cvs/extras/rpms/mimetex/devel/mimetex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mimetex.spec	9 Oct 2005 18:31:29 -0000	1.2
+++ mimetex.spec	14 Feb 2006 05:02:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mimetex
 Version:        1.60
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easily embed LaTeX math in web pages
 
 Group:          Applications/Publishing
@@ -39,5 +39,8 @@
 %doc /%{_var}/www/html/%{name}.html
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.60-2
+- Rebuild for Fedora Extras 5
+
 * Sun Oct  9 2005 Ignacio Vazquez-Abrams  1.60-1
 - Initial RPM release



From fedora-extras-commits at redhat.com  Tue Feb 14 05:02:36 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:02:36 -0500
Subject: rpms/numpy/devel numpy.spec,1.2,1.3
Message-ID: <200602140504.k1E54BdM017975@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	numpy.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- numpy.spec	4 Feb 2006 19:22:38 -0000	1.2
+++ numpy.spec	14 Feb 2006 05:02:36 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           numpy
 Version:        0.9.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -64,6 +64,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.9.4-2
+- Rebuild for Fedora Extras 5
+
 * Thu Feb  2 2006 Ignacio Vazquez-Abrams  0.9.4-1
 - Initial RPM release
 - Added gfortran patch from Neal Becker



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:32 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:32 -0500
Subject: rpms/evas/devel evas.spec,1.2,1.3
Message-ID: <200602140504.k1E54Ai0017959@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	evas.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/evas.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evas.spec	11 Feb 2006 15:52:13 -0000	1.2
+++ evas.spec	14 Feb 2006 05:00:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           evas
 Version:        0.9.9.023
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -74,5 +74,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.9.9.023-2
+- Rebuild for Fedora Extras 5
+
 * Sun Feb  5 2006 Ignacio Vazquez-Abrams  0.9.9.023-1
 - Initial RPM release



From fedora-extras-commits at redhat.com  Tue Feb 14 05:02:43 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:02:43 -0500
Subject: rpms/ortp/devel ortp.spec,1.7,1.8
Message-ID: <200602140504.k1E54FIO017979@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	ortp.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ortp.spec	3 Jan 2006 07:32:41 -0000	1.7
+++ ortp.spec	14 Feb 2006 05:02:43 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           ortp
 Version:        0.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -53,6 +53,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.8.1-2
+- Rebuild for Fedora Extras 5
+
 * Tue Jan  3 2006 Ignacio Vazquez-Abrams  0.8.1-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:01:58 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:01:58 -0500
Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec,1.11,1.12
Message-ID: <200602140504.k1E54Jlc017984@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15719/lock-keys-applet/devel

Modified Files:
	lock-keys-applet.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/devel/lock-keys-applet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lock-keys-applet.spec	22 Apr 2005 19:55:09 -0000	1.11
+++ lock-keys-applet.spec	14 Feb 2006 05:01:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        9
+Release:        10
 
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
@@ -53,6 +53,9 @@
 %{_libexecdir}/%{name}
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.0-10
+- Rebuild for Fedora Extras 5
+
 * Fri Apr 22 2005 Ignacio Vazquez-Abrams  1.0-9
 - Minor cleanup
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:01:26 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:01:26 -0500
Subject: rpms/libosip/devel libosip.spec,1.8,1.9
Message-ID: <200602140504.k1E54JU1017987@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	libosip.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: libosip.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip/devel/libosip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libosip.spec	23 Nov 2005 17:14:12 -0000	1.8
+++ libosip.spec	14 Feb 2006 05:01:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libosip
 Version:        0.9.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        oSIP is an implementation of SIP
 
 Group:          System Environment/Libraries
@@ -69,6 +69,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.9.7-9
+- Rebuild for Fedora Extras 5
+
 * Wed Nov 23 2005 Ignacio Vazquez-Abrams  0.9.7-8
 - Remove static libs
 - Remove .la files



From fedora-extras-commits at redhat.com  Tue Feb 14 05:01:43 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:01:43 -0500
Subject: rpms/libsexy/devel libsexy.spec,1.5,1.6
Message-ID: <200602140504.k1E54JVm017989@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	libsexy.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: libsexy.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexy/devel/libsexy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsexy.spec	6 Feb 2006 04:33:59 -0000	1.5
+++ libsexy.spec	14 Feb 2006 05:01:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libsexy
 Version:        0.1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
@@ -55,6 +55,9 @@
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.1.6-2
+- Rebuild for Fedora Extras 5
+
 * Sun Feb  5 2006 Ignacio Vazquez-Abrams  0.1.6-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Tue Feb 14 04:59:57 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 13 Feb 2006 23:59:57 -0500
Subject: rpms/OpenEXR/devel OpenEXR.spec,1.6,1.7
Message-ID: <200602140504.k1E54BFc017977@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	OpenEXR.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/devel/OpenEXR.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenEXR.spec	17 Aug 2005 22:50:54 -0000	1.6
+++ OpenEXR.spec	14 Feb 2006 04:59:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           OpenEXR
 Version:        1.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.2.2-6
+- Rebuild for Fedora Extras 5
+
 * Wed Aug 17 2005 Ignacio Vazquez-Abrams  1.2.2-5
 - Remove *.a from %%files devel
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:02:10 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:02:10 -0500
Subject: rpms/mod_auth_pam/devel mod_auth_pam.spec,1.4,1.5
Message-ID: <200602140504.k1E54CII017978@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	mod_auth_pam.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: mod_auth_pam.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_pam/devel/mod_auth_pam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_auth_pam.spec	15 Dec 2005 16:40:55 -0000	1.4
+++ mod_auth_pam.spec	14 Feb 2006 05:02:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mod_auth_pam
 Version:        1.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PAM authentication module for Apache
 
 Group:          System Environment/Daemons
@@ -52,6 +52,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.1.1-4
+- Rebuild for Fedora Extras 5
+
 * Thu Dec 15 2005 Ignacio Vazquez-Abrams  1.1.1-3
 - Bump for Apache 2.2.0
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:01:00 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:01:00 -0500
Subject: rpms/gnome-applet-rhythmbox/devel .cvsignore, 1.2,
	1.3 gnome-applet-rhythmbox.spec, 1.3, 1.4 sources, 1.2,
	1.3 gnome-applet-rhythmbox-0.1.7-sentinel.patch, 1.1, NONE
Message-ID: <200602140504.k1E54A8k017960@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gnome-applet-rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15719/gnome-applet-rhythmbox/devel

Modified Files:
	.cvsignore gnome-applet-rhythmbox.spec sources 
Removed Files:
	gnome-applet-rhythmbox-0.1.7-sentinel.patch 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-rhythmbox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2005 18:00:37 -0000	1.2
+++ .cvsignore	14 Feb 2006 05:01:00 -0000	1.3
@@ -1 +1 @@
-rhythmbox-applet-0.1.7.tar.gz
+rhythmbox-applet-0.1.10.tar.gz


Index: gnome-applet-rhythmbox.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-rhythmbox/devel/gnome-applet-rhythmbox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-rhythmbox.spec	29 Aug 2005 19:19:52 -0000	1.3
+++ gnome-applet-rhythmbox.spec	14 Feb 2006 05:01:00 -0000	1.4
@@ -1,16 +1,15 @@
 Name:           gnome-applet-rhythmbox
-Version:        0.1.7
-Release:        2%{?dist}
+Version:        0.1.10
+Release:        1%{?dist}
 Summary:        A GNOME panel applet to control Rhythmbox's playback
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://web.ics.purdue.edu/~kuliniew/rhythmbox-applet/
 Source0:        http://web.ics.purdue.edu/~kuliniew/rhythmbox-applet/downloads/rhythmbox-applet-%{version}.tar.gz
-Patch:          %{name}-0.1.7-sentinel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel eel2-devel rhythmbox
+BuildRequires:  gnome-panel-devel eel2-devel rhythmbox dbus-devel
 #Requires:       
 
 %description
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q -n rhythmbox-applet-%{version}
-%patch -p1 -b .sentinel
 
 %build
 %configure
@@ -43,6 +41,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.1.10-1
+- Upstream update
+
 * Mon Aug 29 2005 Ignacio Vazquez-Abrams  0.1.7-2
 - Added patch to fix build with GTK+ 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-rhythmbox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 18:00:37 -0000	1.2
+++ sources	14 Feb 2006 05:01:00 -0000	1.3
@@ -1 +1 @@
-7283ee13320cf13aba1916fba3e5d054  rhythmbox-applet-0.1.7.tar.gz
+2f5081e6876a38db6c01e771f9e04453  rhythmbox-applet-0.1.10.tar.gz


--- gnome-applet-rhythmbox-0.1.7-sentinel.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:09 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:09 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet-2.13.91-fedorabz.patch,
	NONE, 
	1.1 .cvsignore, 1.8, 1.9 deskbar-applet.spec, 1.13, 1.14 sources,
	1.8, 1.9
Message-ID: <200602140504.k1E54KYI018002@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15719/deskbar-applet/devel

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Added Files:
	deskbar-applet-2.13.91-fedorabz.patch 
Log Message:
M-M-M-M-MONSTER UPDATE

deskbar-applet-2.13.91-fedorabz.patch:

--- NEW FILE deskbar-applet-2.13.91-fedorabz.patch ---
--- deskbar-applet-2.13.91/data/art/Makefile.in.fedorabz	2006-02-11 08:55:26.000000000 -0500
+++ deskbar-applet-2.13.91/data/art/Makefile.in	2006-02-13 20:22:50.000000000 -0500
@@ -244,6 +244,7 @@
 	deskbar-applet-panel-v.png \
 	deskbar-applet-panel-h.png \
 	deskbar-applet-small.png \
+	fedorabz.png \
 	folder-bookmark.png \
 	generic.png \
 	yahoo.png \
--- deskbar-applet-2.13.91/deskbar/handlers/Makefile.in.fedorabz	2006-02-11 08:55:27.000000000 -0500
+++ deskbar-applet-2.13.91/deskbar/handlers/Makefile.in	2006-02-13 20:27:13.000000000 -0500
@@ -238,7 +238,7 @@
 deskbar_handlersdir = $(libdir)/deskbar-applet/handlers
 deskbar_handlers_PYTHON = beagle.py beagle-live.py email_address.py \
 	epiphany.py files.py galago.py galeon.py gtkbookmarks.py \
-	google-live.py history.py mozilla.py programs.py \
+	google-live.py history.py mozilla.py programs.py fedorabz.py \
 	pathprograms.py volumes.py web_address.py yahoo.py \
 	$(am__append_1)
 EXTRA_DIST = \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Feb 2006 21:16:11 -0000	1.8
+++ .cvsignore	14 Feb 2006 05:00:09 -0000	1.9
@@ -1 +1 @@
-deskbar-applet-2.13.90.tar.bz2
+deskbar-applet-2.13.91.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- deskbar-applet.spec	2 Feb 2006 21:16:11 -0000	1.13
+++ deskbar-applet.spec	14 Feb 2006 05:00:09 -0000	1.14
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.13.90
+Version:        2.13.91
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -12,7 +12,7 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.13/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-2.13.90-fedorabz.patch
+Patch0:         deskbar-applet-2.13.91-fedorabz.patch
 Patch1:         deskbar-applet-2.13.90-gnomeapplet.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet
@@ -36,7 +36,7 @@
 cp %{SOURCE1} deskbar/handlers
 cp %{SOURCE2} data/art
 %patch -p1 -b .fedorabz
-%patch1 -p1 -b .gnomeapplet
+#%patch1 -p1 -b .gnomeapplet
 
 %build
 %configure
@@ -63,6 +63,9 @@
 %{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  2.13.90.1-1
+- Upstream update
+
 * Thu Feb  2 2006 Ignacio Vazquez-Abrams  2.13.90-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Feb 2006 21:16:11 -0000	1.8
+++ sources	14 Feb 2006 05:00:09 -0000	1.9
@@ -1 +1 @@
-fe8c47c622589a8b1e857ab6a2b0cd1b  deskbar-applet-2.13.90.tar.bz2
+693c3221d73e8a6fe59144249e6deb43  deskbar-applet-2.13.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:14 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:14 -0500
Subject: rpms/ecore/devel ecore.spec,1.2,1.3
Message-ID: <200602140504.k1E54Jgd017981@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	ecore.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/ecore.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ecore.spec	11 Feb 2006 23:50:10 -0000	1.2
+++ ecore.spec	14 Feb 2006 05:00:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ecore
 Version:        0.9.9.023
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -71,5 +71,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.9.9.023-2
+- Rebuild for Fedora Extras 5
+
 * Sun Feb  5 2006 Ignacio Vazquez-Abrams  0.9.9.023-1
 - Initial RPM release



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:55 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:55 -0500
Subject: rpms/gnet2/devel gnet2.spec,1.6,1.7
Message-ID: <200602140504.k1E54Bms017976@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	gnet2.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: gnet2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnet2/devel/gnet2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnet2.spec	9 Nov 2005 16:17:44 -0000	1.6
+++ gnet2.spec	14 Feb 2006 05:00:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnet2
 Version:        2.0.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A simple network library built upon glib
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  2.0.7-6
+- Rebuild for Fedora Extras 5
+
 * Wed Nov  9 2005 Ignacio Vazquez-Abrams  2.0.7-5
 - Removed static libs
 - Removed .la



From fedora-extras-commits at redhat.com  Tue Feb 14 05:03:10 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:03:10 -0500
Subject: rpms/pam_mysql/devel pam_mysql.spec,1.10,1.11
Message-ID: <200602140504.k1E54K5K018001@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	pam_mysql.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/devel/pam_mysql.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pam_mysql.spec	13 Nov 2005 06:34:12 -0000	1.10
+++ pam_mysql.spec	14 Feb 2006 05:03:09 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.6.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:          1
 
 License:	GPL
@@ -36,6 +36,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.6.2-3
+- Rebuild for Fedora Extras 5
+
 * Fri Nov 13 2005 Ignacio Vazquez-Abrams  0.6.2-2
 - Fixed build on x86_64
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:01:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:01:33 -0500
Subject: rpms/libosip2/devel libosip2.spec,1.6,1.7
Message-ID: <200602140504.k1E54JXd017990@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	libosip2.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/libosip2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libosip2.spec	22 Dec 2005 23:59:46 -0000	1.6
+++ libosip2.spec	14 Feb 2006 05:01:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  2.2.2-2
+- Rebuild for Fedora Extras 5
+
 * Thu Dec 22 2005 Ignacio Vazquez-Abrams  2.2.2-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:43 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:43 -0500
Subject: rpms/fyre/devel fyre.spec,1.12,1.13
Message-ID: <200602140504.k1E54IvJ017980@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	fyre.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fyre.spec	18 Jan 2006 05:06:27 -0000	1.12
+++ fyre.spec	14 Feb 2006 05:00:43 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -78,6 +78,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.0.0-13
+- Rebuild for Fedora Extras 5
+
 * Tue Jan 17 2006 Ignacio Vazquez-Abrams  1.0.0-12
 - Move chkconfig and service to %%preun (#178129)
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:03:16 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:03:16 -0500
Subject: rpms/php-json/devel .cvsignore, 1.2, 1.3 php-json.html, 1.1,
	1.2 php-json.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200602140504.k1E54KMw017999@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15719/php-json/devel

Modified Files:
	.cvsignore php-json.html php-json.spec sources 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2005 11:25:32 -0000	1.2
+++ .cvsignore	14 Feb 2006 05:03:16 -0000	1.3
@@ -1 +1 @@
-php-json-ext-1.1.0.tar.bz2
+php-json-ext-1.1.1.tar.bz2


Index: php-json.html
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-json.html	31 Dec 2005 11:25:32 -0000	1.1
+++ php-json.html	14 Feb 2006 05:03:16 -0000	1.2
@@ -19,7 +19,7 @@
 	
 	omar kilani

    
 	home | projects
    
-	
    libical | php-js | php-json | postfix_memcached
    
+	
    libical | misc | php-js | php-json | postfix_memcached
    
 	
    
 	
 	           
@@ -30,6 +30,7 @@
 	
    php-json
    
         
    php-json is an extremely fast PHP C extension for JSON (JavaScript Object Notation) serialisation. php-json uses a forked version of json-c.
    
         
    Download
    
+        
    Version 1.1.1 (SRPM, Win32) - Released 2006-01-25 - TSRM performance improvements, changed license to version 3.01 of the PHP license, avoid a potential memory leak on invalid JSON input.
    
         
    Version 1.1.0 (SRPM, Win32: PHP 4.x, PHP 5.0.x, PHP 5.1.x) - Released 2005-12-04 - Port to Win32.
    
         
    Version 1.0.8 (SRPM) - Released 2005-12-01 - Changed license to LGPL, modified build system to allow static compilation into PHP, added strndup check for json-c.
    
         
    Version 1.0.7 - Released 2005-09-07 - Fixed issues with negative array keys (Thanks to Marek Lewczuk for the report,) modified json-c to return an error on unquoted object key names instead of going into an infinite loop.
    
@@ -67,20 +68,27 @@
   
 
         
    Documentation
    
-        
    A simple ./configure; make; make install should do the trick. Make sure to add an extension=json.so line to your php.ini/php.d. Note: you need to compile php-json with gcc 3.x and up.
    
+        
    A simple ./configure; make; make install should do the trick. Make sure to add an extension=json.so line to your php.ini/php.d.
    
         
    Then, just use json_encode to encode your PHP values into JSON, and json_decode to decode JSON into a PHP value.
    
         
    For example:
    
         
    +$val = array("abc" => 12,
+             "foo" => "bar",
+             "bool0" => false,
+             "bool1" => true,
+             "arr" => array(1, 2, 3, null, 5),
+             "float" => 1.2345
+            );
 $output = json_encode($val);
 echo $output."\n";
         
     
         
    Would produce:
    
         
    -{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }
+{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.234500 }
         
    
         
    While:
    
         
    -$input = '{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }';
+$input = '{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.234500 }';
 $val = json_decode($input);
 echo $val->abc."\n";
         
    
@@ -92,7 +100,7 @@
         
    A PHP object correlates to a JavaScript object (associative array, i.e., key => value pairs), so the above would be referenced in JavaScript like so:
    
         
     var obj = ...; /* retrieve JSON and eval() it, returning an object */
-var result = obj["abc"] * obj["float"];
+var result = obj["abc"] * obj["float"]; /* obj.abc would be the same as obj["abc"] */
 alert("result is " + result);
         
    
         
    This should display an alert box with the value of result, i.e., 14.814.
    


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-json.spec	18 Jan 2006 07:13:28 -0000	1.3
+++ php-json.spec	14 Feb 2006 05:03:16 -0000	1.4
@@ -2,12 +2,12 @@
 %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)}
 
 Name:           php-json
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
-License:        LGPL
+License:        PHP
 URL:            http://www.aurore.net/projects/php-json/
 Source0:        http://www.aurore.net/projects/php-json/php-json-ext-%{version}.tar.bz2
 Source1:        php-json.html
@@ -63,6 +63,9 @@
 %{php_extdir}/json.so
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.1.1-1
+- Upstream update
+
 * Wed Jan 18 2006 Ignacio Vazquez-Abrams  1.1.0-2
 - Rebuild for new PHP
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Dec 2005 11:25:32 -0000	1.2
+++ sources	14 Feb 2006 05:03:16 -0000	1.3
@@ -1 +1 @@
-4a1a41fafabf866784868af59bf30510  php-json-ext-1.1.0.tar.bz2
+d884a5ca7ddb420b5b261941217f6c68  php-json-ext-1.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Feb 14 05:02:18 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:02:18 -0500
Subject: rpms/nautilus-search-tool/devel nautilus-search-tool.spec,1.2,1.3
Message-ID: <200602140504.k1E54Ait017965@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	nautilus-search-tool.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: nautilus-search-tool.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-search-tool/devel/nautilus-search-tool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-search-tool.spec	7 Sep 2005 02:39:40 -0000	1.2
+++ nautilus-search-tool.spec	14 Feb 2006 05:02:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nautilus-search-tool
 Version:        0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Nautilus extension to put "Search for Files" on the context menu of folders
 
 Group:          System Environment/Shells
@@ -37,5 +37,8 @@
 %{_libdir}/nautilus/extensions-1.0/*.so
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.1-2
+- Rebuild for Fedora Extras 5
+
 * Tue Sep  3 2005 Ignacio Vazquez-Abrams  0.1-1
 - Initial RPM release



From fedora-extras-commits at redhat.com  Tue Feb 14 05:01:51 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:01:51 -0500
Subject: rpms/linphone/devel linphone.spec,1.18,1.19
Message-ID: <200602140504.k1E54K1m018000@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	linphone.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linphone.spec	8 Feb 2006 06:17:38 -0000	1.18
+++ linphone.spec	14 Feb 2006 05:01:51 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.2.0-2
+- Rebuild for Fedora Extras 5
+
 * Wed Feb  8 2006 Ignacio Vazquez-Abrams  1.2.0-1
 - Added version for speex-devel BR (#179879)
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:00:37 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:00:37 -0500
Subject: rpms/fltk/devel fltk.spec,1.14,1.15
Message-ID: <200602140504.k1E54JUj017983@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	fltk.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fltk.spec	17 Nov 2005 06:56:35 -0000	1.14
+++ fltk.spec	14 Feb 2006 05:00:37 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	C++ user interface toolkit for X11, Win32, and MacOS X
 Name:		fltk
-Version:	1.1.6
-Release:	4%{?dist}
+Version:	1.1.7
+Release:	1%{?dist}
 
 License:	LGPL with exceptions
 Group:		System Environment/Libraries
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.1.7-1
+- Upstream update
+
 * Thu Nov 17 2005 Ignacio Vazquez-Abrams  1.1.6-4
 - Fixed BR and -devel Requires for modular X
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:01:19 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:01:19 -0500
Subject: rpms/libifp/devel libifp.spec,1.5,1.6
Message-ID: <200602140504.k1E54JUI017985@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	libifp.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: libifp.spec
===================================================================
RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libifp.spec	22 Aug 2005 13:48:36 -0000	1.5
+++ libifp.spec	14 Feb 2006 05:01:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libifp
 Version:        1.0.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A general-purpose library-driver for iRiver's iFP portable audio players
 
 Group:          System Environment/Base
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  1.0.0.2-2
+- Rebuild for Fedora Extras 5
+
 * Mon Aug 22 2005 Ignacio Vazquez-Abrams  1.0.0.2-1
 - Upstream update
 - Disabled build of static libraries



From fedora-extras-commits at redhat.com  Tue Feb 14 05:01:07 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:01:07 -0500
Subject: rpms/leafpad/devel leafpad.spec,1.16,1.17
Message-ID: <200602140504.k1E54A5j017964@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	leafpad.spec 
Log Message:
M-M-M-M-MONSTER UPDATE


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/leafpad.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- leafpad.spec	3 Feb 2006 08:17:12 -0000	1.16
+++ leafpad.spec	14 Feb 2006 05:01:06 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           leafpad
 Version:        0.8.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        GTK+ based simple text editor
 
@@ -58,6 +58,9 @@
 %exclude %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Mon Feb 13 2006 Ignacio Vazquez-Abrams  0.8.7-2
+- Rebuild for Fedora Extras 5
+
 * Fri Feb  3 2006 Ignacio Vazquez-Abrams  0.8.7-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Tue Feb 14 05:20:39 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 14 Feb 2006 00:20:39 -0500
Subject: rpms/perl-GnuPG-Interface/devel .cvsignore, 1.2,
	1.3 perl-GnuPG-Interface.spec, 1.3, 1.4 sources, 1.2,
	1.3 secret-key-output-1.patch, 1.1, NONE
Message-ID: <200602140521.k1E5LB1g018294@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/perl-GnuPG-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263

Modified Files:
	.cvsignore perl-GnuPG-Interface.spec sources 
Removed Files:
	secret-key-output-1.patch 
Log Message:
fix 'make test' key expiry, rebuild for FC5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 14:23:31 -0000	1.2
+++ .cvsignore	14 Feb 2006 05:20:38 -0000	1.3
@@ -1 +1,2 @@
 GnuPG-Interface-0.33.tar.gz
+GnuPG-Interface-0.33-unexpire-test-keys.tar.gz


Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-GnuPG-Interface.spec	6 Oct 2005 03:02:01 -0000	1.3
+++ perl-GnuPG-Interface.spec	14 Feb 2006 05:20:38 -0000	1.4
@@ -1,13 +1,13 @@
 Name:           perl-GnuPG-Interface
 Version:        0.33
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GnuPG-Interface
 Source0:        http://search.cpan.org/CPAN/authors/id/F/FT/FTOBIN/GnuPG-Interface-%{version}.tar.gz
+Source1:        GnuPG-Interface-%{version}-unexpire-test-keys.tar.gz
 Patch0:		GnuPG-Interface-0.33.tru-record-type.txt
-Patch1:		secret-key-output-1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gpg, perl(Class::MethodMaker)
@@ -19,12 +19,11 @@
 %{summary}.
 
 %prep
-%setup -q -n GnuPG-Interface-%{version}
+%setup -q -b 1 -n GnuPG-Interface-%{version}
 perldoc -t perlgpl > GPL
 perldoc -t perlartistic > Artistic
 
 %patch0 -p0
-%patch1 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -53,6 +52,11 @@
 
 
 %changelog
+* Mon Feb 13 2006 Matt Domsch  0.33-6
+- add 10 years to expiry date of test gpg keys,
+  lets 'make test' succeed after 2006-02-05.
+- rebuild for FC5
+
 * Thu Oct 06 2005 Ralf Corsepius  - 0.33-5
 - Requires: perl(Class::MethodMaker) (PR #169976).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GnuPG-Interface/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 14:23:31 -0000	1.2
+++ sources	14 Feb 2006 05:20:38 -0000	1.3
@@ -1 +1,2 @@
 7349795ec874c2af78eec7f274d96bc8  GnuPG-Interface-0.33.tar.gz
+ad0eb26f8261b5e129d90486326a7e77  GnuPG-Interface-0.33-unexpire-test-keys.tar.gz


--- secret-key-output-1.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb 14 05:21:55 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 00:21:55 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet.spec, 1.14,
	1.15 deskbar-applet-2.13.90-fedorabz.patch, 1.1,
	NONE deskbar-applet-2.13.90-gnomeapplet.patch, 1.1, NONE
Message-ID: <200602140522.k1E5MRln018373@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18347

Modified Files:
	deskbar-applet.spec 
Removed Files:
	deskbar-applet-2.13.90-fedorabz.patch 
	deskbar-applet-2.13.90-gnomeapplet.patch 
Log Message:
Killing off a few stragglers


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- deskbar-applet.spec	14 Feb 2006 05:00:09 -0000	1.14
+++ deskbar-applet.spec	14 Feb 2006 05:21:55 -0000	1.15
@@ -13,7 +13,6 @@
 Source1:        fedorabz.py
 Source2:        fedorabz.png
 Patch0:         deskbar-applet-2.13.91-fedorabz.patch
-Patch1:         deskbar-applet-2.13.90-gnomeapplet.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2
@@ -36,7 +35,6 @@
 cp %{SOURCE1} deskbar/handlers
 cp %{SOURCE2} data/art
 %patch -p1 -b .fedorabz
-#%patch1 -p1 -b .gnomeapplet
 
 %build
 %configure


--- deskbar-applet-2.13.90-fedorabz.patch DELETED ---


--- deskbar-applet-2.13.90-gnomeapplet.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb 14 06:54:44 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 14 Feb 2006 01:54:44 -0500
Subject: rpms/Maelstrom/devel Maelstrom-3.0.6-64bit.patch, 1.1,
	1.2 Maelstrom.spec, 1.5, 1.6
Message-ID: <200602140655.k1E6tGcj021430@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	Maelstrom-3.0.6-64bit.patch Maelstrom.spec 
Log Message:
update


Maelstrom-3.0.6-64bit.patch:

Index: Maelstrom-3.0.6-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom-3.0.6-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Maelstrom-3.0.6-64bit.patch	26 May 2005 17:47:56 -0000	1.1
+++ Maelstrom-3.0.6-64bit.patch	14 Feb 2006 06:54:43 -0000	1.2
@@ -1,13 +1,13 @@
---- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp.foo	2005-05-26 13:43:00.000000000 -0400
-+++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp	2005-05-26 13:44:25.000000000 -0400
+--- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp.ook	2006-02-14 01:50:13.000000000 -0500
++++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp	2006-02-14 01:50:58.000000000 -0500
 @@ -848,8 +848,8 @@
  			for ( i=0; i 3.0.6-9
+* Mon Feb 13 2006 Bill Nottingham  3.0.6-10
 - rebuild
 
 * Thu May 26 2005 Bill Nottingham 



From fedora-extras-commits at redhat.com  Tue Feb 14 07:24:35 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue, 14 Feb 2006 02:24:35 -0500
Subject: rpms/crack/devel crack.spec,1.2,1.3
Message-ID: <200602140725.k1E7P7I8023708@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	crack.spec 
Log Message:
rebuild for FE 5


Index: crack.spec
===================================================================
RCS file: /cvs/extras/rpms/crack/devel/crack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crack.spec	23 Dec 2005 17:20:08 -0000	1.2
+++ crack.spec	14 Feb 2006 07:24:35 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:   Password cracker
 Name:      crack
 Version:   5.0a
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   Artistic
 Group:     Applications/System
 Source:    ftp://ftp.cerias.purdue.edu/pub/tools/unix/pwdutils/crack/%{name}5.0.tar.gz
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Christian Iseli  5.0a-3
+- rebuild for FE 5
+
 * Fri Dec 23 2005 Christian Iseli  5.0a-2
 - rebuild with gcc-4.1
 



From fedora-extras-commits at redhat.com  Tue Feb 14 08:07:43 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 14 Feb 2006 03:07:43 -0500
Subject: rpms/tinyerp/devel tinyerp.spec,1.14,1.15
Message-ID: <200602140808.k1E88IMI025896@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - rebuild for Fedora Extras 5



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tinyerp.spec	30 Jan 2006 13:56:00 -0000	1.14
+++ tinyerp.spec	14 Feb 2006 08:07:43 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -137,6 +137,9 @@
 
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Tue Feb 14 08:12:28 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 03:12:28 -0500
Subject: rpms/edb/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200602140813.k1E8D04w026019@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Log Message:
Snarf


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Oct 2005 00:14:04 -0000	1.4
+++ .cvsignore	14 Feb 2006 08:12:28 -0000	1.5
@@ -1 +1 @@
-edb-1.0.5.004.tar.gz
+edb-1.0.5.005.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Oct 2005 00:14:04 -0000	1.4
+++ sources	14 Feb 2006 08:12:28 -0000	1.5
@@ -1 +1 @@
-2565467041d770240f93969c6055e35f  edb-1.0.5.004.tar.gz
+6b6eaa69ea05bf4b4972554f34fd8919  edb-1.0.5.005.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 08:13:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 14 Feb 2006 03:13:36 -0500
Subject: rpms/airsnort/devel airsnort.spec,1.5,1.6
Message-ID: <200602140814.k1E8E8L8026052@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	airsnort.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: airsnort.spec
===================================================================
RCS file: /cvs/extras/rpms/airsnort/devel/airsnort.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- airsnort.spec	21 Nov 2005 22:12:07 -0000	1.5
+++ airsnort.spec	14 Feb 2006 08:13:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           airsnort
 Version:        0.2.7e
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Wireless LAN (WLAN) tool which recovers encryption keys
 
 Group:          Applications/Communications
@@ -61,6 +61,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+0.2.7e-8
+- Rebuild for Fedora Extras 5
+
 * Wed Nov 16 2005 Andreas Bierfert 
 0.2.7e-7
 - remove xorg-x11-devel BR



From fedora-extras-commits at redhat.com  Tue Feb 14 08:17:18 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 03:17:18 -0500
Subject: rpms/fltk/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200602140817.k1E8Hosl026216@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Log Message:
Gralf


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Oct 2005 08:34:08 -0000	1.3
+++ .cvsignore	14 Feb 2006 08:17:17 -0000	1.4
@@ -1 +1 @@
-fltk-1.1.6-source.tar.bz2
+fltk-1.1.7-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Oct 2005 08:34:08 -0000	1.3
+++ sources	14 Feb 2006 08:17:17 -0000	1.4
@@ -1 +1 @@
-95d340977d13edea12e98d787a668b32  fltk-1.1.6-source.tar.bz2
+2e29319119adc9d63b2f26b72cae0a88  fltk-1.1.7-source.tar.bz2



From fedora-extras-commits at redhat.com  Tue Feb 14 08:19:33 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 14 Feb 2006 03:19:33 -0500
Subject: rpms/artwiz-aleczapka-fonts/devel artwiz-aleczapka-fonts.spec, 1.1, 
	1.2
Message-ID: <200602140820.k1E8K507026329@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/artwiz-aleczapka-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26299

Modified Files:
	artwiz-aleczapka-fonts.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: artwiz-aleczapka-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/artwiz-aleczapka-fonts/devel/artwiz-aleczapka-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- artwiz-aleczapka-fonts.spec	31 Dec 2005 14:51:44 -0000	1.1
+++ artwiz-aleczapka-fonts.spec	14 Feb 2006 08:19:33 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           artwiz-aleczapka-fonts
 Version:        1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Set of (improved) artwiz fonts
 
 Group:          User Interface/X
@@ -88,6 +88,10 @@
 
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+1.3-4
+Rebuild for Fedora Extras 5
+
 * Sat Dec 31 2005 Andreas Bierfert 
 1.3-3
 - apply fixes from Dawid Gajownik



From fedora-extras-commits at redhat.com  Tue Feb 14 08:27:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 14 Feb 2006 03:27:27 -0500
Subject: rpms/atitvout/devel atitvout.spec,1.7,1.8
Message-ID: <200602140827.k1E8Rxbw026410@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	atitvout.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: atitvout.spec
===================================================================
RCS file: /cvs/extras/rpms/atitvout/devel/atitvout.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- atitvout.spec	6 Apr 2005 22:11:11 -0000	1.7
+++ atitvout.spec	14 Feb 2006 08:27:27 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           atitvout
 Version:        0.4
-Release:        4
+Release:        5
 
 Summary:        ATI Rage/Radeon TV Out configuration program
 
@@ -71,6 +71,10 @@
 
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+0.4-5
+- Rebuild for Fedora Extras 5
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Feb 14 08:35:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 14 Feb 2006 03:35:02 -0500
Subject: rpms/bubblemon/devel bubblemon.spec,1.3,1.4
Message-ID: <200602140835.k1E8ZYTH026506@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	bubblemon.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: bubblemon.spec
===================================================================
RCS file: /cvs/extras/rpms/bubblemon/devel/bubblemon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bubblemon.spec	21 Nov 2005 23:08:14 -0000	1.3
+++ bubblemon.spec	14 Feb 2006 08:35:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bubblemon
 Version:        1.46
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A system monitoring dockapp
 
 Group:          User Interface/X
@@ -49,6 +49,10 @@
 %{_bindir}/bubblemon
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+1.46-5
+Rebuild for Fedora Extras 5
+
 * Mon Nov 21 2005 Andreas Bierfert 
 1.46-4
 - rebuild (without xorg-x11-devel BR)



From fedora-extras-commits at redhat.com  Tue Feb 14 08:43:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 14 Feb 2006 03:43:05 -0500
Subject: rpms/dosbox/devel dosbox.spec,1.16,1.17
Message-ID: <200602140843.k1E8hcTM026626@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	dosbox.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dosbox.spec	25 Jan 2006 14:02:43 -0000	1.16
+++ dosbox.spec	14 Feb 2006 08:43:05 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           dosbox
 Version:        0.63
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        x86/DOS emulator with sound and graphics
 
@@ -72,6 +72,10 @@
 
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+0.63-9
+- Rebuild for Fedora Extras 5
+
 * Wed Jan 25 2006 Andreas Bierfert 
 0.63-8
 - apply upstream patch



From fedora-extras-commits at redhat.com  Tue Feb 14 08:50:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 14 Feb 2006 03:50:36 -0500
Subject: rpms/dynamite/devel dynamite.spec,1.3,1.4
Message-ID: <200602140851.k1E8p8M4026697@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	dynamite.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: dynamite.spec
===================================================================
RCS file: /cvs/extras/rpms/dynamite/devel/dynamite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dynamite.spec	26 Aug 2005 06:22:05 -0000	1.3
+++ dynamite.spec	14 Feb 2006 08:50:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dynamite
 Version:        0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extract data compressed with PKWARE Data Compression Library
 
 Group:          Applications/Communications
@@ -55,6 +55,10 @@
 %{_datadir}/aclocal/dynamite.m4
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+0.1-4
+- Rebuild for Fedora Extras 5
+
 * Fri Aug 26 2005 Andreas Bierfert 
 0.1-3
 - require v-r for devel package



From fedora-extras-commits at redhat.com  Tue Feb 14 08:55:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 14 Feb 2006 03:55:01 -0500
Subject: rpms/fluxconf/devel fluxconf.spec,1.9,1.10
Message-ID: <200602140855.k1E8tXrC026769@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	fluxconf.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fluxconf.spec	23 Jan 2006 08:01:02 -0000	1.9
+++ fluxconf.spec	14 Feb 2006 08:55:01 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		fluxconf
 Version:	0.9.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	Configuration utility for fluxbox
 
@@ -51,6 +51,10 @@
 %lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+0.9.9-2
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 23 2006 Andreas Bierfert 
 0.9.9-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Feb 14 08:57:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 14 Feb 2006 03:57:24 -0500
Subject: rpms/fnfx/devel fnfx.spec,1.3,1.4
Message-ID: <200602140857.k1E8vuPo026848@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	fnfx.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: fnfx.spec
===================================================================
RCS file: /cvs/extras/rpms/fnfx/devel/fnfx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fnfx.spec	24 Aug 2005 08:11:24 -0000	1.3
+++ fnfx.spec	14 Feb 2006 08:57:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           fnfx
 Version:        0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Hotkey functions for Toshiba laptops
 
 Group:          System Environment/Daemons
@@ -63,6 +63,10 @@
 %exclude %{_sysconfdir}/fnfx/fnfxrc_example
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+0.3-6
+- Rebuild for Fedora Extras 5
+
 * Wed Aug 24 2005 Andreas Bierfert 
 0.3-5
 - add dist



From fedora-extras-commits at redhat.com  Tue Feb 14 09:05:46 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 14 Feb 2006 04:05:46 -0500
Subject: rpms/themes-backgrounds-gnome/devel themes-backgrounds-gnome.spec,
	1.8, 1.9
Message-ID: <200602140906.k1E96IvV029048@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29027

Modified Files:
	themes-backgrounds-gnome.spec 
Log Message:



Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- themes-backgrounds-gnome.spec	29 Jan 2006 10:00:27 -0000	1.8
+++ themes-backgrounds-gnome.spec	14 Feb 2006 09:05:46 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
@@ -34,6 +34,9 @@
 %{_datadir}/gnome-background-properties/themes-backgrounds-gnome.xml
 
 %changelog
+* Tue Feb 14 2006 Chris Chabot  - 0.4-3
+- Rebuild for Fedora Extras 5
+
 * Sun Jan 29 2006 Chris Chabot  - 0.4-2
 - Added dist tag to release field
 - Fixed dir ownership of themes-backgrounds-gnome



From fedora-extras-commits at redhat.com  Tue Feb 14 09:06:49 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 14 Feb 2006 04:06:49 -0500
Subject: rpms/libtorrent/devel libtorrent.spec,1.2,1.3
Message-ID: <200602140907.k1E97LId029108@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	libtorrent.spec 
Log Message:



Index: libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtorrent.spec	10 Feb 2006 06:49:59 -0000	1.2
+++ libtorrent.spec	14 Feb 2006 09:06:49 -0000	1.3
@@ -2,7 +2,7 @@
 License:       GPL
 Group:         System Environment/Libraries
 Version:       0.8.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 14 2006 Chris Chabot  - 0.8.2-4
+- Rebuild for Fedora Extras 5
+
 * Fri Feb 10 2006 - Chris Chabot  - 0.8.2-3                                                               
 - Rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Tue Feb 14 09:07:50 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 14 Feb 2006 04:07:50 -0500
Subject: rpms/themes-backgrounds-gnome/devel themes-backgrounds-gnome.spec,
	1.9, 1.10
Message-ID: <200602140908.k1E98MDQ029182@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29148

Modified Files:
	themes-backgrounds-gnome.spec 
Log Message:



Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- themes-backgrounds-gnome.spec	14 Feb 2006 09:05:46 -0000	1.9
+++ themes-backgrounds-gnome.spec	14 Feb 2006 09:07:49 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
 Version:        0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
@@ -34,6 +34,9 @@
 %{_datadir}/gnome-background-properties/themes-backgrounds-gnome.xml
 
 %changelog
+* Tue Feb 14 2006 Chris Chabot  - 0.4-4
+- Buildsys messup
+
 * Tue Feb 14 2006 Chris Chabot  - 0.4-3
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Tue Feb 14 09:10:16 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 14 Feb 2006 04:10:16 -0500
Subject: rpms/rtorrent/devel rtorrent.spec,1.3,1.4
Message-ID: <200602140910.k1E9AwxP029295@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	rtorrent.spec 
Log Message:



Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rtorrent.spec	10 Feb 2006 06:50:46 -0000	1.3
+++ rtorrent.spec	14 Feb 2006 09:10:16 -0000	1.4
@@ -2,7 +2,7 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.4.2
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -39,6 +39,9 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Tue Feb 14 2006 Chris Chabot  - 0.4.2-5
+- Rebuild for Fedora Extras 5
+
 * Fri Feb 10 2006 - Chris Chabot  - 0.4.2-4
 - Rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Tue Feb 14 09:13:02 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 14 Feb 2006 04:13:02 -0500
Subject: rpms/buoh/devel buoh.spec,1.8,1.9
Message-ID: <200602140913.k1E9DYbN029515@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	buoh.spec 
Log Message:



Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buoh.spec	10 Feb 2006 06:48:27 -0000	1.8
+++ buoh.spec	14 Feb 2006 09:13:01 -0000	1.9
@@ -2,7 +2,7 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.1
-Release:          6
+Release:          7
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
 Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
+* Tue Feb 14 2006 Chris Chabot  - 0.8.1-7
+- Rebuild for Fedora Extras 5
+
 * Fri Feb 10 2006 - Chris Chabot  - 0.8.1-6
 - Rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Tue Feb 14 09:42:30 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Tue, 14 Feb 2006 04:42:30 -0500
Subject: rpms/rinetd/devel rinetd.spec,1.2,1.3
Message-ID: <200602140943.k1E9h3SC029757@cvs-int.fedora.redhat.com>

Author: kaboom

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

Modified Files:
	rinetd.spec 
Log Message:
rebuild for FC5



Index: rinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/rinetd/devel/rinetd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rinetd.spec	30 Jun 2005 20:28:58 -0000	1.2
+++ rinetd.spec	14 Feb 2006 09:42:30 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: TCP redirection server
 Name: rinetd
 Version: 0.62
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.boutell.com/rinetd
@@ -66,6 +66,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/rinetd
 
 %changelog
+* Tue Feb 14 2006 Chris Ricker  0.62-5
+- rebuild for FC5
+
 * Thu Jun 30 2005 Chris Ricker  0.62-4
 - use SIGHUP for reload in init script (Ville Skytt??)
 - example config file made mode 0644 (Ville Skytt??)



From fedora-extras-commits at redhat.com  Tue Feb 14 09:53:40 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Feb 2006 04:53:40 -0500
Subject: rpms/gtorrentviewer/devel gtorrentviewer.spec,1.4,1.5
Message-ID: <200602140954.k1E9sClf029898@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	gtorrentviewer.spec 
Log Message:
- cosmetic tweak: use macros instead of variables
- don't use macros in command paths, hardcode them instead



Index: gtorrentviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/gtorrentviewer/devel/gtorrentviewer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtorrentviewer.spec	9 Nov 2005 19:18:45 -0000	1.4
+++ gtorrentviewer.spec	14 Feb 2006 09:53:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gtorrentviewer
 Version:        0.2b
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A GTK2-based viewer and editor for BitTorrent meta files
 
 Group:          Applications/Internet
@@ -29,24 +29,24 @@
 %{__make} %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/GTorrentViewer/README
-%{_bindir}/desktop-file-install \
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%{__rm} -f %{buildroot}%{_datadir}/GTorrentViewer/README
+/usr/bin/desktop-file-install \
         --vendor fedora \
 	--add-category X-Fedora \
         --delete-original \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        $RPM_BUILD_ROOT%{_datadir}/applications/gtorrentviewer.desktop
+        --dir %{buildroot}%{_datadir}/applications \
+        %{buildroot}%{_datadir}/applications/gtorrentviewer.desktop
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post
-%{_bindir}/update-desktop-database > /dev/null || :
+/usr/bin/update-desktop-database > /dev/null || :
 
 %postun
-%{_bindir}/update-desktop-database > /dev/null || :
+/usr/bin/update-desktop-database > /dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -59,6 +59,10 @@
 %{_mandir}/man1/gtorrentviewer.1*
 
 %changelog
+* 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
+
 * Thu Nov  9 2005 Paul Howarth  0.2b-7
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb 14 09:54:12 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 14 Feb 2006 04:54:12 -0500
Subject: rpms/qps/devel qps.spec,1.3,1.4
Message-ID: <200602140954.k1E9siu4029944@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	qps.spec 
Log Message:
Rebuild for Fedora Extras 5



Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qps.spec	18 Dec 2005 03:16:37 -0000	1.3
+++ qps.spec	14 Feb 2006 09:54:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           qps
 Version:        1.9.11
-Release:        2.1%{?dist}
+Release:        2.2%{?dist}
 Summary:        Visual process status monitor
 
 Group:          Applications/System
@@ -56,6 +56,9 @@
 
 
 %changelog
+* 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
 - Fix compilation with GCC 4.1
 - Use funny release tag because tarball name contains `-' character



From fedora-extras-commits at redhat.com  Tue Feb 14 09:55:37 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 14 Feb 2006 04:55:37 -0500
Subject: rpms/python-enchant/devel python-enchant.spec,1.5,1.6
Message-ID: <200602140956.k1E9uAQI030057@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	python-enchant.spec 
Log Message:
* Tue Feb 14 2006 Roozbeh Pournader  - 1.1.5-3
- Rebuild for Fedora Extras 5



Index: python-enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-enchant.spec	7 Feb 2006 08:45:37 -0000	1.5
+++ python-enchant.spec	14 Feb 2006 09:55:37 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-enchant
 Version:        1.1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for Enchant spellchecking library
 
 Group:          Development/Languages
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Roozbeh Pournader  - 1.1.5-3
+- Rebuild for Fedora Extras 5
+
 * Tue Feb 07 2006 Roozbeh Pournader  - 1.1.5-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb 14 09:57:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Feb 2006 04:57:42 -0500
Subject: rpms/gtorrentviewer/FC-4 gtorrentviewer.spec,1.3,1.4
Message-ID: <200602140958.k1E9wHWx030135@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	gtorrentviewer.spec 
Log Message:
resync with devel



Index: gtorrentviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/gtorrentviewer/FC-4/gtorrentviewer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtorrentviewer.spec	17 Oct 2005 07:07:48 -0000	1.3
+++ gtorrentviewer.spec	14 Feb 2006 09:57:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gtorrentviewer
 Version:        0.2b
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A GTK2-based viewer and editor for BitTorrent meta files
 
 Group:          Applications/Internet
@@ -29,24 +29,24 @@
 %{__make} %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/GTorrentViewer/README
-%{_bindir}/desktop-file-install \
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%{__rm} -f %{buildroot}%{_datadir}/GTorrentViewer/README
+/usr/bin/desktop-file-install \
         --vendor fedora \
 	--add-category X-Fedora \
         --delete-original \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        $RPM_BUILD_ROOT%{_datadir}/applications/gtorrentviewer.desktop
+        --dir %{buildroot}%{_datadir}/applications \
+        %{buildroot}%{_datadir}/applications/gtorrentviewer.desktop
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post
-%{_bindir}/update-desktop-database > /dev/null || :
+/usr/bin/update-desktop-database > /dev/null || :
 
 %postun
-%{_bindir}/update-desktop-database > /dev/null || :
+/usr/bin/update-desktop-database > /dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -59,6 +59,13 @@
 %{_mandir}/man1/gtorrentviewer.1*
 
 %changelog
+* 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
+
+* Thu Nov  9 2005 Paul Howarth  0.2b-7
+- rebuild
+
 * Mon Oct 17 2005 Paul Howarth  0.2b-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb 14 09:58:17 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 14 Feb 2006 04:58:17 -0500
Subject: rpms/htop/devel htop.spec,1.3,1.4
Message-ID: <200602140958.k1E9wnUU030152@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	htop.spec 
Log Message:
Rebuild for Fedora Extras 5



Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- htop.spec	28 Dec 2005 22:28:28 -0000	1.3
+++ htop.spec	14 Feb 2006 09:58:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Dawid Gajownik  - 0.6-3
+- Rebuild for Fedora Extras 5
+
 * Wed Dec 28 2005 Dawid Gajownik  - 0.6-2
 - Rebuild with updated tarball
 



From fedora-extras-commits at redhat.com  Tue Feb 14 10:01:33 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 14 Feb 2006 05:01:33 -0500
Subject: rpms/python-sqlite2/devel python-sqlite2.spec,1.6,1.7
Message-ID: <200602141002.k1EA25n9032109@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	python-sqlite2.spec 
Log Message:
Rebuild for Fedora Extras 5



Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-sqlite2.spec	5 Feb 2006 10:57:04 -0000	1.6
+++ python-sqlite2.spec	14 Feb 2006 10:01:33 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           python-sqlite2
 Version:        2.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Dawid Gajownik  - 1:2.1.3-4
+- Rebuild for Fedora Extras 5
+
 * Sun Feb  5 2006 Dawid Gajownik  - 1:2.1.3-3
 - python-sqlite2 in FC-4 was downgraded -> Epoch had to be bumped.
   We need to do the same in development branch



From fedora-extras-commits at redhat.com  Tue Feb 14 10:05:53 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 14 Feb 2006 05:05:53 -0500
Subject: rpms/spicctrl/devel spicctrl.spec,1.1,1.2
Message-ID: <200602141006.k1EA6QXW032234@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	spicctrl.spec 
Log Message:
* Tue Feb 14 2006 Roozbeh Pournader  1.9-3
- Rebuild for Fedora Extras 5



Index: spicctrl.spec
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/devel/spicctrl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spicctrl.spec	31 Jan 2006 19:03:38 -0000	1.1
+++ spicctrl.spec	14 Feb 2006 10:05:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           spicctrl
 Version:        1.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sony Vaio laptop SPIC control program
 
 Group:          Applications/System
@@ -59,6 +59,9 @@
 %attr(0755,root,root) /usr/sbin/spicctrl
 
 %changelog
+* Tue Feb 14 2006 Roozbeh Pournader  1.9-3
+- Rebuild for Fedora Extras 5
+
 * Tue Jan 31 2006 Roozbeh Pournader  1.9-2
 - Bumped release to a proper integer
 



From fedora-extras-commits at redhat.com  Tue Feb 14 10:05:53 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 14 Feb 2006 05:05:53 -0500
Subject: rpms/t1lib/devel t1lib.spec,1.9,1.10
Message-ID: <200602141006.k1EA6Qlq032235@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	t1lib.spec 
Log Message:
* Tue Feb 14 2006 Roozbeh Pournader  - 5.1.0-5
- Rebuild for Fedora Extras 5



Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- t1lib.spec	17 Jan 2006 15:01:42 -0000	1.9
+++ t1lib.spec	14 Feb 2006 10:05:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Roozbeh Pournader  - 5.1.0-5
+- Rebuild for Fedora Extras 5
+
 * Tue Jan 17 2006 Roozbeh Pournader  - 5.1.0-4
 - %%ghost-ing config files, also making sure they're regenerated
 



From fedora-extras-commits at redhat.com  Tue Feb 14 10:06:52 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 14 Feb 2006 05:06:52 -0500
Subject: rpms/gajim/devel gajim.spec,1.7,1.8
Message-ID: <200602141007.k1EA7Op3032366@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	gajim.spec 
Log Message:
Rebuild for Fedora Extras 5



Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gajim.spec	15 Jan 2006 16:11:52 -0000	1.7
+++ gajim.spec	14 Feb 2006 10:06:51 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           gajim
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
@@ -98,6 +98,9 @@
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Tue Feb 14 2006 Dawid Gajownik  - 0.9.1-2
+- Rebuild for Fedora Extras 5
+
 * Sun Jan 15 2006 Dawid Gajownik  - 0.9.1-1
 - update to 0.9.1 (Eric Tanguy, #176614)
 - drop aplay.patch



From fedora-extras-commits at redhat.com  Tue Feb 14 10:07:01 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 14 Feb 2006 05:07:01 -0500
Subject: rpms/t1utils/devel t1utils.spec,1.10,1.11
Message-ID: <200602141007.k1EA7YnX032369@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	t1utils.spec 
Log Message:
* Tue Feb 14 2006 Roozbeh Pournader  - 1.32-6
- Rebuild for Fedora Extras 5



Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- t1utils.spec	17 Jan 2006 10:29:09 -0000	1.10
+++ t1utils.spec	14 Feb 2006 10:07:01 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		t1utils
 Version:	1.32
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Roozbeh Pournader  - 1.32-6
+- Rebuild for Fedora Extras 5
+
 * Tue Jan 17 2006 Roozbeh Pournader  - 1.32-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb 14 10:10:53 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 14 Feb 2006 05:10:53 -0500
Subject: rpms/ttf2pt1/devel ttf2pt1.spec,1.7,1.8
Message-ID: <200602141010.k1EAAuw1032480@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Feb 14 2006 Roozbeh Pournader  - 3.4.4-7
- Rebuild for Fedora Extras 5



Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/devel/ttf2pt1.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ttf2pt1.spec	17 Jan 2006 15:32:06 -0000	1.7
+++ ttf2pt1.spec	14 Feb 2006 10:10:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Roozbeh Pournader  - 3.4.4-7
+- Rebuild for Fedora Extras 5
+
 * Tue Jan 17 2006 Roozbeh Pournader  - 3.4.4-6
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb 14 10:10:53 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 14 Feb 2006 05:10:53 -0500
Subject: rpms/translate-toolkit/devel translate-toolkit.spec,1.4,1.5
Message-ID: <200602141011.k1EAAufK032481@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32445

Modified Files:
	translate-toolkit.spec 
Log Message:
* Tue Feb 14 2006 Roozbeh Pournader  - 0.8-0.9.rc6
- Rebuild for Fedora Extras 5



Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/devel/translate-toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- translate-toolkit.spec	7 Feb 2006 08:38:00 -0000	1.4
+++ translate-toolkit.spec	14 Feb 2006 10:10:53 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           translate-toolkit
 Version:        0.8
-Release:        0.8.%{alphatag}%{?dist}
+Release:        0.9.%{alphatag}%{?dist}
 Summary:        A collection of tools to assist software localization
 
 Group:          Development/Tools
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Roozbeh Pournader  - 0.8-0.9.rc6
+- Rebuild for Fedora Extras 5
+
 * Tue Feb 07 2006 Roozbeh Pournader  - 0.8-0.8.rc6
 - Require python-enchant for spellchecking support in pofilter
 



From fedora-extras-commits at redhat.com  Tue Feb 14 12:37:09 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Feb 2006 07:37:09 -0500
Subject: rpms/gpgme03/devel gpgme03.spec,1.13,1.14
Message-ID: <200602141237.k1ECbfoF004150@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	gpgme03.spec 
Log Message:
rebuild for fc5



Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gpgme03.spec	22 Dec 2005 15:03:19 -0000	1.13
+++ gpgme03.spec	14 Feb 2006 12:37:08 -0000	1.14
@@ -4,7 +4,7 @@
 Summary:        GnuPG Made Easy interface library
 Name:           gpgme03
 Version:        0.3.16
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        GPL
 Group:          Applications/System
 Source:         ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz
@@ -107,6 +107,8 @@
 
 
 %changelog
+* Tue Feb 14 2006 Dennis Gilmore  - 0.3.16-10
+- Rebuild for FC5
 * Thu Dec 22 2005 Dennis Gilmore  - 0.3.16-9
 - rebuild with gcc 4.1
 



From fedora-extras-commits at redhat.com  Tue Feb 14 12:39:54 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Feb 2006 07:39:54 -0500
Subject: rpms/konversation/devel konversation.spec,1.6,1.7
Message-ID: <200602141240.k1ECeRAr004214@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	konversation.spec 
Log Message:
rebuild for fc5



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- konversation.spec	30 Jan 2006 16:45:52 -0000	1.6
+++ konversation.spec	14 Feb 2006 12:39:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           konversation
 Version:        0.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -83,10 +83,15 @@
 
 
 %changelog
+* Tue Feb 14 2006 Dennis Gilmore  - 0.19-2
+- rebuild for fc5
+
 * Mon Jan 30 2006 Dennis Gilmore  - 0.19-1
 - update to 0.19
+
 * Thu Dec 22 2005 Dennis Gilmore  - 0.18-6
 - Rebuild for gcc 4.1
+
 * Sat Oct 20 2005 Dennis Gilmore  - 0.18-5
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist 
 - add %post and %postun scriptlets  to notify of new icons per



From fedora-extras-commits at redhat.com  Tue Feb 14 12:42:29 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Feb 2006 07:42:29 -0500
Subject: rpms/kphone/devel kphone.spec,1.22,1.23
Message-ID: <200602141243.k1ECh1RJ004285@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	kphone.spec 
Log Message:
rebuild for fc5



Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kphone.spec	5 Feb 2006 21:31:14 -0000	1.22
+++ kphone.spec	14 Feb 2006 12:42:29 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -35,7 +35,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure 
+%configure  --enable-srtp
 make %{?_smp_mflags}
 
 %install
@@ -64,6 +64,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* 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  Tue Feb 14 12:46:46 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Feb 2006 07:46:46 -0500
Subject: rpms/ktrack/devel ktrack.spec,1.13,1.14
Message-ID: <200602141247.k1EClIh1004372@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	ktrack.spec 
Log Message:
rebuild for fc5



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/ktrack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ktrack.spec	22 Dec 2005 13:05:13 -0000	1.13
+++ ktrack.spec	14 Feb 2006 12:46:46 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 12.rc1.%{?dist}
+Release: 13.rc1%{?dist}
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -59,6 +59,9 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* The Feb 14 2005 Dennis Gilmore  - 0.3.0-13.rc1
+- rebuild for fc5
+
 * Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1
 - rebuild for gcc 4.1
 



From fedora-extras-commits at redhat.com  Tue Feb 14 12:48:10 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Feb 2006 07:48:10 -0500
Subject: rpms/ktrack/devel ktrack.spec,1.14,1.15
Message-ID: <200602141248.k1ECmg4w004417@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	ktrack.spec 
Log Message:
correct year in changelog



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/ktrack.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ktrack.spec	14 Feb 2006 12:46:46 -0000	1.14
+++ ktrack.spec	14 Feb 2006 12:48:10 -0000	1.15
@@ -59,7 +59,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
-* The Feb 14 2005 Dennis Gilmore  - 0.3.0-13.rc1
+* The Feb 14 2006 Dennis Gilmore  - 0.3.0-13.rc1
 - rebuild for fc5
 
 * Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1



From fedora-extras-commits at redhat.com  Tue Feb 14 12:50:41 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Feb 2006 07:50:41 -0500
Subject: rpms/mysql-administrator/devel mysql-administrator.spec,1.2,1.3
Message-ID: <200602141251.k1ECpDcU004462@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443

Modified Files:
	mysql-administrator.spec 
Log Message:
rebuild for fc5



Index: mysql-administrator.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/mysql-administrator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-administrator.spec	16 Jan 2006 22:03:20 -0000	1.2
+++ mysql-administrator.spec	14 Feb 2006 12:50:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           mysql-administrator
 Version:        1.1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GUI to manage mysql Databases
 
 Group:          Applications/Databases
@@ -108,17 +108,25 @@
 %{_datadir}/mysql-gui/common
 
 %changelog
+* Tue Feb 14 2006 Dennis Gilmore  - 1.1.6-2
+- rebuild for fc5
+
 * Thu Jan 12 2006 Dennis Gilmore  - 1.1.6-1
 - update to 1.1.6 make mysql-gui-common description more appropriate
 - Fix Help,  apply patch for backup failure bugzilla #177849
 - add new lang files
+
 * Thu Jan 12 2006 Dennis Gilmore  - 1.1.5-3
 - apply gcc4.1 patch only on fc5 
+
 * Wed Jan 11 2006 Dennis Gilmore  - 1.1.5-2
 - fix lang files and trailing /
+
 * Sat Jan 07 2006 Dennis Gilmore  - 1.1.5-1
 - update to 1.1.5
+
 * Fri Oct 28 2005 Dennis Gilmore  - 1.1.4-1
 - update to 1.1.4  update build requires to gtkmm24-devel
+
 * Wed Sep 28 2005 Dennis Gilmore  - 1.1.2-1
 - Initial Build



From fedora-extras-commits at redhat.com  Tue Feb 14 12:52:07 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Feb 2006 07:52:07 -0500
Subject: rpms/ktrack/devel ktrack.spec,1.15,1.16
Message-ID: <200602141252.k1ECqdP5004525@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	ktrack.spec 
Log Message:
fix date properlly



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/ktrack.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ktrack.spec	14 Feb 2006 12:48:10 -0000	1.15
+++ ktrack.spec	14 Feb 2006 12:52:07 -0000	1.16
@@ -59,7 +59,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
-* The Feb 14 2006 Dennis Gilmore  - 0.3.0-13.rc1
+* Thu Feb 14 2006 Dennis Gilmore  - 0.3.0-13.rc1
 - rebuild for fc5
 
 * Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1



From fedora-extras-commits at redhat.com  Tue Feb 14 13:05:27 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 14 Feb 2006 08:05:27 -0500
Subject: rpms/nagios/devel nagios.spec,1.7,1.8
Message-ID: <200602141305.k1ED5xG8006392@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Log Message:
Rebuild for FE 5



Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nagios.spec	10 Feb 2006 04:37:02 -0000	1.7
+++ nagios.spec	14 Feb 2006 13:05:27 -0000	1.8
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.4.rc2%{?dist}
+Release: 0.5.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -154,6 +154,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Tue Feb 14 2006 Mike McGrath  2.0-0.5.rc2
+-Rebuild for Fedora Extras 5
+
 * Tue Feb 09 2006 Mike McGrath  2.0-0.4.rc2
 - Made /private/* group owner Nagios.  This fixes SIGHUP config read issue.
 



From fedora-extras-commits at redhat.com  Tue Feb 14 13:58:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 08:58:31 -0500
Subject: rpms/nautilus-flac-converter - New directory
Message-ID: <200602141358.k1EDwXtf006656@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/nautilus-flac-converter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6648/nautilus-flac-converter

Log Message:
Directory /cvs/extras/rpms/nautilus-flac-converter added to the repository




From fedora-extras-commits at redhat.com  Tue Feb 14 13:58:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 08:58:37 -0500
Subject: rpms/nautilus-flac-converter/devel - New directory
Message-ID: <200602141358.k1EDwdWx006671@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/nautilus-flac-converter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6648/nautilus-flac-converter/devel

Log Message:
Directory /cvs/extras/rpms/nautilus-flac-converter/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Feb 14 13:58:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 08:58:49 -0500
Subject: rpms/nautilus-flac-converter Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602141358.k1EDwpaZ006705@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/nautilus-flac-converter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6693

Added Files:
	Makefile import.log 
Log Message:
Setup of module nautilus-flac-converter


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Feb 14 13:58:55 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 08:58:55 -0500
Subject: rpms/nautilus-flac-converter/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200602141358.k1EDwvDA006725@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/nautilus-flac-converter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6693/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nautilus-flac-converter


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Feb 14 13:59:19 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 08:59:19 -0500
Subject: rpms/nautilus-flac-converter import.log,1.1,1.2
Message-ID: <200602141359.k1EDxpY8006795@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/nautilus-flac-converter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6759

Modified Files:
	import.log 
Log Message:
auto-import nautilus-flac-converter-0.0.2-2 on branch devel from nautilus-flac-converter-0.0.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nautilus-flac-converter/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Feb 2006 13:58:49 -0000	1.1
+++ import.log	14 Feb 2006 13:59:19 -0000	1.2
@@ -0,0 +1 @@
+nautilus-flac-converter-0_0_2-2:HEAD:nautilus-flac-converter-0.0.2-2.src.rpm:1139925555



From fedora-extras-commits at redhat.com  Tue Feb 14 13:59:24 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 08:59:24 -0500
Subject: rpms/nautilus-flac-converter/devel nautilus-flac-converter.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602141359.k1EDxvhx006799@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/nautilus-flac-converter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6759/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nautilus-flac-converter.spec 
Log Message:
auto-import nautilus-flac-converter-0.0.2-2 on branch devel from nautilus-flac-converter-0.0.2-2.src.rpm


--- NEW FILE nautilus-flac-converter.spec ---
Name:           nautilus-flac-converter
Version:        0.0.2
Release:        2%{?dist}
Summary:        Nautilus extension to convert FLACS to Ogg Vorbis

Group:          User Interface/Desktops
License:        GPL
URL:            http://nautilus-flac.sourceforge.net/
Source0:        http://download.sourceforge.net/nautilus-flac/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libglade2-devel >= 2.4.0
BuildRequires:	gnome-vfs2-devel >= 2.6.0
BuildRequires:	nautilus >= 2.6.0

Requires:	vorbis-tools 


%description
Adds a "Convert FLAC to Ogg..." menu item to the context menu
of all flacs. This opens a dialog where you set the ogg vorbis
quality, and encoding directory. A click on "Ok" finally converts
the flac to ogg vorbis.


%prep
%setup -q


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


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


%clean
rm -rf $RPM_BUILD_ROOT


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


%changelog
* Tue Feb  7 2006 Brian Pepple  - 0.0.2-2
- Update URL & Source for sourceforge address.

* Tue Jan 31 2006 Brian Pepple  - 0.0.2-1
- Update to 0.0.2.

* Sun Jan 29 2006 Brian Pepple  - 0.0.1-1
- Initial spec file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-flac-converter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Feb 2006 13:58:55 -0000	1.1
+++ .cvsignore	14 Feb 2006 13:59:24 -0000	1.2
@@ -0,0 +1 @@
+nautilus-flac-converter-0.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-flac-converter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Feb 2006 13:58:55 -0000	1.1
+++ sources	14 Feb 2006 13:59:24 -0000	1.2
@@ -0,0 +1 @@
+227ef3faa6bda6fcfab3646cb5af3ba1  nautilus-flac-converter-0.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Feb 14 14:02:39 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 09:02:39 -0500
Subject: owners owners.list,1.636,1.637
Message-ID: <200602141403.k1EE3C9a008642@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	owners.list 
Log Message:
Add nautilus-flac-converter


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -r1.636 -r1.637
--- owners.list	13 Feb 2006 18:04:26 -0000	1.636
+++ owners.list	14 Feb 2006 14:02:39 -0000	1.637
@@ -666,6 +666,7 @@
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-actions|Nautilus extension for customizing the context menu|dakingun at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|nautilus-flac-converter|Nautilus extension to convert FLACS to Ogg Vorbis|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-image-converter|Nautilus extension to mass resize images|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Feb 14 14:05:42 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 14 Feb 2006 09:05:42 -0500
Subject: rpms/cacti/devel cacti.spec,1.1,1.2
Message-ID: <200602141406.k1EE6FWv008722@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	cacti.spec 
Log Message:
Rebuild for Fedora Extras 5



Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti.spec	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti.spec	14 Feb 2006 14:05:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6h
-Release: 4
+Release: 5
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -106,6 +106,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php
 
 %changelog
+* Tue Feb 14 2006 Mike McGrath  - 0.8.6h-5
+- Rebuild for Fedora Extras 5
+
 * Mon Feb 6 2006 Mike McGrath  - 0.8.6h-4
 - Fixed some scriptlets to always return 0
 - Fixed extra '/' in logrotate



From fedora-extras-commits at redhat.com  Tue Feb 14 14:34:22 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 14 Feb 2006 09:34:22 -0500
Subject: rpms/yumex/devel .cvsignore, 1.13, 1.14 sources, 1.16,
	1.17 yumex.spec, 1.17, 1.18
Message-ID: <200602141434.k1EEYsrv008898@cvs-int.fedora.redhat.com>

Author: timlau

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

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
new release 0.99.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Feb 2006 12:45:01 -0000	1.13
+++ .cvsignore	14 Feb 2006 14:34:22 -0000	1.14
@@ -1 +1 @@
-yumex-0.99.5.tar.gz
+yumex-0.99.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Feb 2006 12:45:01 -0000	1.16
+++ sources	14 Feb 2006 14:34:22 -0000	1.17
@@ -1 +1 @@
-1f867239c92def7a4ee9a1bd8b306a6c  yumex-0.99.5.tar.gz
+f65540baf9646f457dfd670e5b31349a  yumex-0.99.8.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- yumex.spec	9 Feb 2006 12:45:01 -0000	1.17
+++ yumex.spec	14 Feb 2006 14:34:22 -0000	1.18
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.5
+Version:  0.99.8
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -14,7 +14,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 
-Requires: yum >= 2.5
+Requires: yum >= 2.4
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -65,6 +65,13 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Tue Feb 14 14:47:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 14 Feb 2006 09:47:19 -0500
Subject: rpms/scalapack/devel scalapack-1.7-fedora.patch, 1.1,
	1.2 scalapack.spec, 1.10, 1.11
Message-ID: <200602141447.k1EElqZU009010@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	scalapack-1.7-fedora.patch scalapack.spec 
Log Message:

Andrew Gormanly's fixes (devel only for now)


scalapack-1.7-fedora.patch:

Index: scalapack-1.7-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scalapack-1.7-fedora.patch	24 Apr 2005 17:46:32 -0000	1.1
+++ scalapack-1.7-fedora.patch	14 Feb 2006 14:47:18 -0000	1.2
@@ -1,5 +1,14 @@
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 16:22:41.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 16:34:42.000000000 -0500
+--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2001-08-09 03:59:50.000000000 +0100
++++ scalapack-1.7/SCALAPACK/SLmake.inc	2006-02-10 13:05:56.000000000 +0000
+@@ -19,7 +19,7 @@
+ #  The complete path to the top level of ScaLAPACK directory, usually
+ #  $(HOME)/SCALAPACK
+ #
+-home          = $(HOME)/SCALAPACK
++home          = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK
+ #
+ #  The platform identifier to suffix to the end of library names
+ #
 @@ -29,16 +29,16 @@
  #  and the directory where the BLACS libraries are
  #
@@ -38,37 +47,27 @@
  SRCFLAG       =
  F77LOADER     = $(F77)
  CCLOADER      = $(CC)
-@@ -94,7 +94,7 @@
+@@ -82,7 +82,7 @@
+ #  C preprocessor defs for compilation 
+ #  (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C)
+ #
+-CDEFS         = -Df77IsF2C -DNO_IEEE $(USEMPI)
++CDEFS         = -DAdd_ -DNO_IEEE $(USEMPI)
+ #
+ #  The archiver and the flag(s) to use when building archive (library)
+ #  Also the ranlib routine.  If your system has no ranlib, set RANLIB = echo
+@@ -94,9 +94,12 @@
  #  The name of the libraries to be created/linked to
  #
  SCALAPACKLIB  = $(home)/libscalapack.a
 -BLASLIB       = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a
 +BLASLIB       = /usr/lib/libblas.a
  #
- PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
- PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 16:59:45.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 16:59:59.000000000 -0500
-@@ -19,7 +19,7 @@
- #  The complete path to the top level of ScaLAPACK directory, usually
- #  $(HOME)/SCALAPACK
- #
--home          = $(HOME)/SCALAPACK
-+home          = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK
- #
- #  The platform identifier to suffix to the end of library names
- #
---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD	2005-04-18 17:17:04.000000000 -0500
-+++ scalapack-1.7/SCALAPACK/SLmake.inc	2005-04-18 17:20:06.000000000 -0500
-@@ -96,7 +96,10 @@
- SCALAPACKLIB  = $(home)/libscalapack.a
- BLASLIB       = /usr/lib/libblas.a
- #
 -PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB)
 -PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB)
 -RLIBS         = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB)
 +LAMLIBS       = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a
-+EXTRALIBS     = -ldl -lpthread -llam -lmpi -llamf77mpi
++EXTRALIBS     = -ldl -lpthread -llam -lmpi -llamf77mpi -lutil
 +
 +PBLIBS        = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)
 +PRLIBS        = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS)


Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scalapack.spec	9 Jan 2006 20:51:36 -0000	1.10
+++ scalapack.spec	14 Feb 2006 14:47:18 -0000	1.11
@@ -1,14 +1,14 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
 BuildRequires: lapack-devel, blas-devel, lam, blacs-devel
-BuildRequires: gcc-gfortran
-Requires: lapack, blas, lam, blacs
+BuildRequires: gcc-gfortran, glibc-devel
+Requires: lapack, blas-devel, lam, blacs-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora.patch
 Patch1: scalapack-1.7-64bitlibs.patch
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Tue Feb 14 2006 Tom "spot" Callaway  1.7-10
+- Incorporate Andrew Gormanly's fixes
+
 * Mon Jan  9 2006 Tom "spot" Callaway  1.7-9
 - fix BR
 



From fedora-extras-commits at redhat.com  Tue Feb 14 15:11:14 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 14 Feb 2006 10:11:14 -0500
Subject: rpms/gtkglext/devel gtkglext.spec,1.7,1.8
Message-ID: <200602141511.k1EFBlsL010861@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	gtkglext.spec 
Log Message:
- Require: libGLU-devel (PR 181018)



Index: gtkglext.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglext/devel/gtkglext.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkglext.spec	6 Feb 2006 14:09:29 -0000	1.7
+++ gtkglext.spec	14 Feb 2006 15:11:14 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:	OpenGL Extension to GTK
 Name:		gtkglext
 Version:	1.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries
@@ -32,6 +32,7 @@
 Requires:	%{name} = %{version}
 Requires:	gtk2-devel
 Requires:	libGL-devel
+Requires:	libGLU-devel
 
 %description devel
 The gtkglext-devel package contains the header files, static libraries,
@@ -76,6 +77,9 @@
 %doc %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Feb 14 2006 Ralf Cors??pius  - 1.2.0-2
+- Require: libGLU-devel (PR 181018)
+
 * Mon Feb 06 2006 Ralf Cors??pius  - 1.2.0-1
 - Upstream update.
 - Spec file cleanup.



From fedora-extras-commits at redhat.com  Tue Feb 14 15:53:51 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 14 Feb 2006 10:53:51 -0500
Subject: rpms/ghdl/devel ghdl.spec,1.7,1.8
Message-ID: <200602141554.k1EFsNUu011042@cvs-int.fedora.redhat.com>

Author: sailer

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

Modified Files:
	ghdl.spec 
Log Message:
rebuild for FC5



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghdl.spec	20 Dec 2005 16:42:04 -0000	1.7
+++ ghdl.spec	14 Feb 2006 15:53:50 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.22
-Release: 0.38svn.0%{?dist}
+Release: 0.38svn.1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -115,13 +115,13 @@
 %endif
 
 # Parallel make doesn't work, so not using %{?_smp_mflags}
-%{__make}
+%{__make} all-host
 
 popd
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install
+%{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install-host
 
 %ifarch x86_64
 pushd obj-%{gcc_target_platform}/gcc/vhdl
@@ -215,6 +215,12 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Wed Feb 14 2006 Thomas Sailer  - 0.22-0.38svn.1
+- rebuild with new compiler for FC5
+
+* Wed Dec 21 2005 Thomas Sailer  - 0.22-0.38svn.0
+- update to svn38, to fix a ghw output bug
+
 * Sun Dec 18 2005 Thomas Sailer  - 0.21-1
 - update to 0.21
 



From fedora-extras-commits at redhat.com  Tue Feb 14 16:32:21 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue, 14 Feb 2006 11:32:21 -0500
Subject: rpms/libnjb/devel libnjb.spec,1.6,1.7
Message-ID: <200602141632.k1EGWsWY013437@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	libnjb.spec 
Log Message:
Rebuild for Fedora Extras 5.



Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libnjb.spec	29 Jan 2006 21:17:38 -0000	1.6
+++ libnjb.spec	14 Feb 2006 16:32:21 -0000	1.7
@@ -12,7 +12,7 @@
 
 Name:		libnjb
 Version:	2.2.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -105,6 +105,8 @@
 
 
 %changelog
+* Tue Feb 14 2006 Linus Walleij  2.2.5-2
+- Rebuild for Fedora Extras 5.
 * Sun Jan 29 2006 Linus Walleij  2.2.5-1
 - New upstream release.
 * Wed Jan 25 2006 Linus Walleij  2.2.4-2



From fedora-extras-commits at redhat.com  Tue Feb 14 16:35:03 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue, 14 Feb 2006 11:35:03 -0500
Subject: rpms/libbinio/devel libbinio.spec,1.1,1.2
Message-ID: <200602141635.k1EGZZxD013873@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	libbinio.spec 
Log Message:
Rebuild for Fedora Extras 5.



Index: libbinio.spec
===================================================================
RCS file: /cvs/extras/rpms/libbinio/devel/libbinio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libbinio.spec	8 Oct 2005 19:24:37 -0000	1.1
+++ libbinio.spec	14 Feb 2006 16:35:02 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		libbinio
 Version:	1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A software library for binary I/O classes in C++
 URL:		http://libbinio.sourceforge.net/
 Group:		System Environment/Libraries
@@ -81,6 +81,9 @@
 %{_infodir}/*.gz
 
 %changelog
+* Tue Feb 14 2006 Linus Walleij  1.4-5
+- Rebuild for Fedora Extras 5.
+
 * Thu Oct 6 2005 Linus Walleij  1.4-4
 - BuildRequire texinfo to get makeinfo.
 



From fedora-extras-commits at redhat.com  Tue Feb 14 16:37:21 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue, 14 Feb 2006 11:37:21 -0500
Subject: rpms/gnomad2/devel gnomad2.spec,1.4,1.5
Message-ID: <200602141637.k1EGbsD3013936@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	gnomad2.spec 
Log Message:
Rebuild for Fedora Extras 5.



Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomad2.spec	23 Oct 2005 21:10:32 -0000	1.4
+++ gnomad2.spec	14 Feb 2006 16:37:21 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name:		gnomad2
 Version:    	2.8.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPL
@@ -77,6 +77,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Tue Feb 14 2006 Linus Walleij  2.8.2-2
+- Rebuild for Fedora Extras 5.
 * Wed Oct 23 2005 Linus Walleij  2.8.2-1
 - New upstream realease.
 * Wed Sep 7 2005 Linus Walleij  2.8.1-1



From fedora-extras-commits at redhat.com  Tue Feb 14 17:14:05 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Feb 2006 12:14:05 -0500
Subject: rpms/stellarium/FC-4 .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 stellarium.spec, 1.11, 1.12
Message-ID: <200602141714.k1EHEbSH015994@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    Add stellarium user guide as doc subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jan 2005 18:29:15 -0000	1.4
+++ .cvsignore	14 Feb 2006 17:14:05 -0000	1.5
@@ -1 +1 @@
-stellarium-0.6.2.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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Oct 2005 16:06:28 -0000	1.5
+++ sources	14 Feb 2006 17:14:05 -0000	1.6
@@ -1 +1 @@
-94cb47d20d31d5e0bba5d9e0189c331b  stellarium-0.7.1.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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stellarium.spec	13 Feb 2006 20:13:27 -0000	1.11
+++ stellarium.spec	14 Feb 2006 17:14:05 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -8,6 +8,7 @@
 URL:            http://stellarium.free.fr/
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -22,6 +23,16 @@
 more than one hundred thousand stars from the Hipparcos Catalogue,
 constellations, planets, major satellites and nebulas.
 
+%package doc
+Summary:   	The user guide about Stellarium
+Group:		Documentation
+License:	GPL
+%description doc
+The user guide for stellarium writeen by Matthew Gates. It shouuld 
+contains everythings you want to know about Stellarium.
+
+You will need a PDF viewer to read the user guide.
+
 
 %prep
 %setup -q
@@ -47,6 +58,7 @@
 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}
+cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version}
 
 %find_lang %{name}
 
@@ -62,7 +74,13 @@
 %{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man1/*
 
+%files doc
+%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf
+
 %changelog
+* Tue Feb 14 2006 Jochen Schmitt  0.7.1-4
+- Add stellarium user guide as doc subpackage
+
 * Mon Feb 13 2006 Jochen Schmitt  0.7.1-3
 - Add SDL_mixer-devel as BuildRequires
 



From fedora-extras-commits at redhat.com  Tue Feb 14 17:21:02 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Tue, 14 Feb 2006 12:21:02 -0500
Subject: rpms/nazghul/devel nazghul-0.5.3-64bit.patch, 1.1, 1.2 nazghul.spec,
	1.2, 1.3
Message-ID: <200602141721.k1EHLZ8L016136@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	nazghul-0.5.3-64bit.patch nazghul.spec 
Log Message:
* Tue Feb 14 2006 Jason L Tibbitts III  - 0.5.3-4
- More 64bit fixes.
- Package additional documentation.


nazghul-0.5.3-64bit.patch:

Index: nazghul-0.5.3-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul-0.5.3-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nazghul-0.5.3-64bit.patch	13 Feb 2006 18:10:24 -0000	1.1
+++ nazghul-0.5.3-64bit.patch	14 Feb 2006 17:21:02 -0000	1.2
@@ -56,3 +56,63 @@
  }
  
  int mapGetRadius(struct mview *view)
+--- src/scheme.c.64bit	2006-02-02 00:26:10.000000000 -0600
++++ src/scheme.c	2006-02-13 18:04:05.368035764 -0600
+@@ -594,7 +594,7 @@
+ 	  i = ++sc->last_cell_seg ;
+ 	  sc->alloc_seg[i] = cp;
+ 	  /* adjust in TYPE_BITS-bit boundary */
+-	  if(((int)cp)%adj!=0) {
++	  if(((long)cp)%adj!=0) {
+ 	    cp=(char*)(adj*((long)cp/adj+1));
+ 	  }
+         /* insert new segment in address order */
+@@ -2138,7 +2138,7 @@
+ 
+ static void s_save(scheme *sc, enum scheme_opcodes op, pointer args, pointer code) 
+ { 
+-  int nframes = (int)sc->dump; 
++  int nframes = (long)sc->dump; 
+   struct dump_stack_frame *next_frame; 
+ 
+   /* enough room for the next frame? */ 
+@@ -2158,7 +2158,7 @@
+ 
+ static pointer _s_return(scheme *sc, pointer a) 
+ { 
+-  int nframes = (int)sc->dump; 
++  int nframes = (long)sc->dump; 
+   struct dump_stack_frame *frame; 
+ 
+   sc->value = (a); 
+@@ -2198,7 +2198,7 @@
+ 
+ static INLINE void dump_stack_mark(scheme *sc) 
+ { 
+-  int nframes = (int)sc->dump;
++  int nframes = (long)sc->dump;
+   int i;
+   for(i=0; isc->vptr->pair_cdr(pair);
+                 goto evaluate_result;
+         } else if (scm_is_ptr(closure->sc, result)) {
+-                ret = (int)closure->sc->vptr->ffvalue(result);
++                ret = (long)closure->sc->vptr->ffvalue(result);
+         }
+ 
+         return ret;
+--- src/tick.c.64bit	2006-02-13 18:17:08.352563117 -0600
++++ src/tick.c	2006-02-13 18:17:49.066410264 -0600
+@@ -37,7 +37,7 @@
+ 	int msecs;
+ 	SDL_Event tick_event;
+ 
+-        msecs = (int)data;
++        msecs = (long)data;
+ 	tick_event.type = SDL_USEREVENT;
+ 	tick_event.user.code = TICK_EVENT;
+ 


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nazghul.spec	13 Feb 2006 18:10:24 -0000	1.2
+++ nazghul.spec	14 Feb 2006 17:21:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nazghul
 Version:        0.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
@@ -37,6 +37,7 @@
 %setup -q
 %patch0
 %patch1 -b .64bit
+mv doc/* .
 
 
 %build
@@ -66,7 +67,8 @@
 %defattr(-,root,root,-)
 %{_bindir}/nazghul
 %dir %{_datadir}/nazghul
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS GAME_RULES GHULSCRIPT
+%doc MAP_HACKERS_GUIDE engine_extension_and_design world_building
 
 
 %files haxima
@@ -75,9 +77,14 @@
 %{_datadir}/nazghul/haxima
 %{_datadir}/applications/fedora-haxima.desktop
 %{_datadir}/pixmaps/haxima.png
+%doc USERS_GUIDE
 
 
 %changelog
+* Tue Feb 14 2006 Jason L Tibbitts III  - 0.5.3-4
+- More 64bit fixes.
+- Package additional documentation.
+
 * Mon Feb 13 2006 Jason L Tibbitts III  - 0.5.3-3
 - Add some 64-bit cleanliness fixes.
 



From fedora-extras-commits at redhat.com  Tue Feb 14 17:22:03 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Feb 2006 12:22:03 -0500
Subject: rpms/stellarium/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 stellarium.spec, 1.13, 1.14
Message-ID: <200602141722.k1EHMZPo016219@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    Add stellarium user guide as doc subpackage
    Add gcc41 patch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2005 20:15:43 -0000	1.5
+++ .cvsignore	14 Feb 2006 17:22:03 -0000	1.6
@@ -1 +1 @@
-stellarium-0.7.1.tar.gz
+stellarium_user_guide-0.7.1-1.pdf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2005 20:15:43 -0000	1.5
+++ sources	14 Feb 2006 17:22:03 -0000	1.6
@@ -1 +1 @@
-94cb47d20d31d5e0bba5d9e0189c331b  stellarium-0.7.1.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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- stellarium.spec	13 Feb 2006 20:22:55 -0000	1.13
+++ stellarium.spec	14 Feb 2006 17:22:03 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.7.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -8,6 +8,8 @@
 URL:            http://stellarium.free.fr/
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -15,6 +17,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 BuildRequires:  ImageMagick
 BuildRequires:  libpng-devel
 
@@ -24,9 +27,19 @@
 more than one hundred thousand stars from the Hipparcos Catalogue,
 constellations, planets, major satellites and nebulas.
 
+%package doc
+Summary:   	The user guide about Stellarium
+Group:		Documentation
+License:	GPL
+%description doc
+The user guide for stellarium writeen by Matthew Gates. It shouuld 
+contains everythings you want to know about Stellarium.
+
+You will need a PDF viewer to read the user guide.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -49,6 +62,7 @@
 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}
+cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version}
 
 %find_lang %{name}
 
@@ -64,8 +78,16 @@
 %{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man1/*
 
+
+%files doc
+%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf
+
 %changelog
-* Mon Feb 13 2006 Jochen Schmitt  0.7.2-4
+* Tue Feb 14 2006 Jochen Schmitt  0.7.1-5
+- Add stellarium user guide as doc subpackage
+- Add gcc41 patch from Diego Petteno
+
+* Mon Feb 13 2006 Jochen Schmitt  0.7.1-4
 - Add SDL_mixer-devel as BuildRequires:
 
 * Sun Feb 12 2006 Jochen Schmitt  0.7.1-3



From fedora-extras-commits at redhat.com  Tue Feb 14 17:29:00 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Feb 2006 12:29:00 -0500
Subject: rpms/xscorch/devel xscorch.spec,1.2,1.3
Message-ID: <200602141729.k1EHTWjj016361@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	xscorch.spec 
Log Message:
- Rebuild



Index: xscorch.spec
===================================================================
RCS file: /cvs/extras/rpms/xscorch/devel/xscorch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xscorch.spec	14 Dec 2005 20:37:52 -0000	1.2
+++ xscorch.spec	14 Feb 2006 17:29:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xscorch
 Version:	0.2.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A Scorched Earth clone
 
 Group:		Amusements/Games
@@ -51,36 +51,39 @@
 %doc doc/AI AUTHORS ChangeLog COPYING doc/make_text_data.pl doc/NETWORK NEWS
 %doc doc/NOTES README TODO
 %{_bindir}/xscorch
-%{_datadir}/xscorch/
-%{_mandir}/man6/xscorch.6*
 %{_datadir}/applications/*xscorch.desktop
+%{_mandir}/man6/xscorch.6*
+%{_datadir}/xscorch/
 
 %changelog
-* Wed Dec 14 2005 Marcin Garski  0.2.0-5
+* Tue Feb 14 2006 Marcin Garski  0.2.0-6
+- Rebuild
+
+* Wed Dec 14 2005 Marcin Garski  0.2.0-5
 - Prepare for modular X.Org
 
-* Fri Aug 26 2005 Marcin Garski  0.2.0-4
+* Fri Aug 26 2005 Marcin Garski  0.2.0-4
 - Disable network
 - Patch fixing stack smashing
 - Patch fixing Readline detection
 
-* Tue Aug 23 2005 Marcin Garski  0.2.0-3
+* Tue Aug 23 2005 Marcin Garski  0.2.0-3
 - Spec improvements for Fedora Extras
 
-* Wed Jun 02 2004 Marcin Garski  0.2.0-2.fc2
+* Wed Jun 02 2004 Marcin Garski  0.2.0-2.fc2
 - Rebuild for Fedora Core 2
 
-* Wed Mar 31 2004 Marcin Garski  0.2.0-1
+* Wed Mar 31 2004 Marcin Garski  0.2.0-1
 - Update to 0.2.0
 
-* Wed Feb 11 2004 Marcin Garski  0.1.16-2
+* Wed Feb 11 2004 Marcin Garski  0.1.16-2
 - Disable sound that cause problems
 
-* Sun Feb  1 2004 Marcin Garski  0.1.16-1
+* Sun Feb  1 2004 Marcin Garski  0.1.16-1
 - Update to 0.1.16
 
-* Sat Jan 31 2004 Marcin Garski  0.1.15-2
+* Sat Jan 31 2004 Marcin Garski  0.1.15-2
 - Added xscorch.desktop
 
-* Sat Jan 31 2004 Marcin Garski  0.1.15-1
+* Sat Jan 31 2004 Marcin Garski  0.1.15-1
 - Initial specfile



From fedora-extras-commits at redhat.com  Tue Feb 14 17:33:53 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Feb 2006 12:33:53 -0500
Subject: rpms/stellarium/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 stellarium.spec, 1.14, 1.15
Message-ID: <200602141734.k1EHYQLI016455@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    Fix error for uploading new files.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Feb 2006 17:22:03 -0000	1.6
+++ .cvsignore	14 Feb 2006 17:33:53 -0000	1.7
@@ -1 +1,2 @@
+stellarium-0.7.1.tar.gz
 stellarium_user_guide-0.7.1-1.pdf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Feb 2006 17:22:03 -0000	1.6
+++ sources	14 Feb 2006 17:33:53 -0000	1.7
@@ -1 +1,2 @@
+94cb47d20d31d5e0bba5d9e0189c331b  stellarium-0.7.1.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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- stellarium.spec	14 Feb 2006 17:22:03 -0000	1.14
+++ stellarium.spec	14 Feb 2006 17:33:53 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.7.1
-Release:        5%{?dist}
+Release:        6%{?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
-* Tue Feb 14 2006 Jochen Schmitt  0.7.1-5
+* Tue Feb 14 2006 Jochen Schmitt  0.7.1-6
 - Add stellarium user guide as doc subpackage
 - Add gcc41 patch from Diego Petteno
 



From fedora-extras-commits at redhat.com  Tue Feb 14 17:38:05 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Feb 2006 12:38:05 -0500
Subject: rpms/xscorch/devel xscorch.spec,1.3,1.4
Message-ID: <200602141738.k1EHcbo0016566@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	xscorch.spec 
Log Message:
- Add Desktop things



Index: xscorch.spec
===================================================================
RCS file: /cvs/extras/rpms/xscorch/devel/xscorch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xscorch.spec	14 Feb 2006 17:29:00 -0000	1.3
+++ xscorch.spec	14 Feb 2006 17:38:05 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xscorch
 Version:	0.2.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A Scorched Earth clone
 
 Group:		Amusements/Games
@@ -15,6 +15,8 @@
 
 BuildRequires:	libX11-devel libXpm-devel gtk2-devel >= 2.4.0 desktop-file-utils
 #BuildRequires:	readline-devel
+Requires(post):	desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
 xscorch is a clone of the classic DOS game, "Scorched Earth". The basic goal
@@ -43,6 +45,10 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	%{SOURCE1}
 
+%post -p update-desktop-database &> /dev/null ||:
+
+%postun -p update-desktop-database &> /dev/null ||:
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,6 +62,9 @@
 %{_datadir}/xscorch/
 
 %changelog
+* Tue Feb 14 2006 Marcin Garski  0.2.0-7
+- Add Desktop things
+
 * Tue Feb 14 2006 Marcin Garski  0.2.0-6
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Feb 14 17:38:08 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Feb 2006 12:38:08 -0500
Subject: rpms/stellarium/devel stellarium-0.7.1-gcc41.patch, NONE,
	1.1 stellarium.spec, 1.15, 1.16
Message-ID: <200602141738.k1EHceJ8016570@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.7.1-gcc41.patch 
Log Message:

  Description:
    Upload gcc41 patch.


stellarium-0.7.1-gcc41.patch:

--- NEW FILE stellarium-0.7.1-gcc41.patch ---
Index: stellarium-0.7.1/src/observator.h
===================================================================
--- stellarium-0.7.1.orig/src/observator.h
+++ stellarium-0.7.1/src/observator.h
@@ -112,8 +112,8 @@ private:
 	string s_time_format_to_string(S_TIME_FORMAT) const;
 
 	// Convert the date format enum to its associated string and reverse
-	S_DATE_FORMAT Observator::string_to_s_date_format(const string& df) const;
-	string Observator::s_date_format_to_string(S_DATE_FORMAT df) const;
+	S_DATE_FORMAT string_to_s_date_format(const string& df) const;
+	string s_date_format_to_string(S_DATE_FORMAT df) const;
 
 	// for changing position
 	bool flag_move_to;
Index: stellarium-0.7.1/src/projector.h
===================================================================
--- stellarium-0.7.1.orig/src/projector.h
+++ stellarium-0.7.1/src/projector.h
@@ -75,7 +75,7 @@ public:
 	virtual void set_viewport(int x, int y, int w, int h);
 
 	// Fill with black around the circle
-	void Projector::draw_viewport_shape(void);
+	void draw_viewport_shape(void);
 
 	int viewW(void) const {return vec_viewport[2];}
 	int viewH(void) const {return vec_viewport[3];}
Index: stellarium-0.7.1/src/stel_command_interface.h
===================================================================
--- stellarium-0.7.1.orig/src/stel_command_interface.h
+++ stellarium-0.7.1/src/stel_command_interface.h
@@ -43,9 +43,9 @@ class StelCommandInterface : CommandInte
  public:
   StelCommandInterface(stel_core * core);
   virtual ~StelCommandInterface();
-  virtual int StelCommandInterface::execute_command(string commandline);
-  virtual int StelCommandInterface::execute_command(string command, double arg);
-  virtual int StelCommandInterface::execute_command(string command, int arg);
+  virtual int execute_command(string commandline);
+  virtual int execute_command(string command, double arg);
+  virtual int execute_command(string command, int arg);
   virtual int execute_command(string command, unsigned long int &wait, bool trusted);
   virtual int set_flag(string name, string value, bool &newval, bool trusted);
   void update(int delta_time);
Index: stellarium-0.7.1/src/stel_ui.h
===================================================================
--- stellarium-0.7.1.orig/src/stel_ui.h
+++ stellarium-0.7.1/src/stel_ui.h
@@ -316,7 +316,7 @@ private:
 	void tui_cb_sky_time();        // change effect parameters
 
 	// Parse a file of type /usr/share/zoneinfo/zone.tab
-	s_tui::MultiSet_item* stel_ui::create_tree_from_time_zone_file(const string& zonetab);
+	s_tui::MultiSet_item* create_tree_from_time_zone_file(const string& zonetab);
 
 	bool ScriptDirectoryRead;
 };


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- stellarium.spec	14 Feb 2006 17:33:53 -0000	1.15
+++ stellarium.spec	14 Feb 2006 17:38:08 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.7.1
-Release:        6%{?dist}
+Release:        7%{?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
-* Tue Feb 14 2006 Jochen Schmitt  0.7.1-6
+* 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  Tue Feb 14 17:40:48 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Feb 2006 12:40:48 -0500
Subject: rpms/xscorch/devel xscorch.spec,1.4,1.5
Message-ID: <200602141741.k1EHfKAl016674@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	xscorch.spec 
Log Message:
-Taging problem



Index: xscorch.spec
===================================================================
RCS file: /cvs/extras/rpms/xscorch/devel/xscorch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xscorch.spec	14 Feb 2006 17:38:05 -0000	1.4
+++ xscorch.spec	14 Feb 2006 17:40:48 -0000	1.5
@@ -45,9 +45,11 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	%{SOURCE1}
 
-%post -p update-desktop-database &> /dev/null ||:
+%post
+update-desktop-database &> /dev/null ||:
 
-%postun -p update-desktop-database &> /dev/null ||:
+%postun
+update-desktop-database &> /dev/null ||:
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Tue Feb 14 17:42:55 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Feb 2006 12:42:55 -0500
Subject: rpms/stellarium/FC-4 .cvsignore, 1.5, 1.6 sources, 1.6,
	1.7 stellarium.spec, 1.12, 1.13
Message-ID: <200602141743.k1EHhRtT016739@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    Fix errornous file upload.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2006 17:14:05 -0000	1.5
+++ .cvsignore	14 Feb 2006 17:42:55 -0000	1.6
@@ -1 +1,2 @@
+stellarium-0.7.1.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Feb 2006 17:14:05 -0000	1.6
+++ sources	14 Feb 2006 17:42:55 -0000	1.7
@@ -1 +1,2 @@
+94cb47d20d31d5e0bba5d9e0189c331b  stellarium-0.7.1.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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stellarium.spec	14 Feb 2006 17:14:05 -0000	1.12
+++ stellarium.spec	14 Feb 2006 17:42:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.7.1
-Release:        4%{?dist}
+Release:        5%{?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
-* Tue Feb 14 2006 Jochen Schmitt  0.7.1-4
+* Tue Feb 14 2006 Jochen Schmitt  0.7.1-5
 - Add stellarium user guide as doc subpackage
 
 * Mon Feb 13 2006 Jochen Schmitt  0.7.1-3



From fedora-extras-commits at redhat.com  Tue Feb 14 17:45:45 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Feb 2006 12:45:45 -0500
Subject: rpms/digikam/devel digikam.spec,1.22,1.23
Message-ID: <200602141746.k1EHkHZG016821@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Rebuild



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- digikam.spec	8 Feb 2006 12:48:57 -0000	1.22
+++ digikam.spec	14 Feb 2006 17:45:45 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -11,8 +11,8 @@
 
 BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
 BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
-BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
-BuildRequires:	desktop-file-utils libtool-ltdl-devel
+BuildRequires:	libtiff-devel libpng-devel sqlite-devel >= 3.0.0 gettext
+BuildRequires:	pkgconfig desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -121,6 +121,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Feb 14 2006 Marcin Garski  0.8.1-3
+- Rebuild
+
 * Wed Feb 08 2006 Marcin Garski  0.8.1-2
 - Exclude x-raw.desktop (bug #179754)
 - Don't own icons directory



From fedora-extras-commits at redhat.com  Tue Feb 14 17:48:11 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Feb 2006 12:48:11 -0500
Subject: rpms/smb4k/devel smb4k.spec,1.3,1.4
Message-ID: <200602141748.k1EHmhMS016888@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	smb4k.spec 
Log Message:
- Rebuild



Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smb4k.spec	8 Feb 2006 12:12:52 -0000	1.3
+++ smb4k.spec	14 Feb 2006 17:48:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		smb4k
 Version:	0.6.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
@@ -109,6 +109,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 14 2006 Marcin Garski  0.6.7-2
+- Rebuild
+
 * Wed Feb 08 2006 Marcin Garski  0.6.7-1
 - Updated to version 0.6.7
 



From fedora-extras-commits at redhat.com  Tue Feb 14 17:50:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 12:50:37 -0500
Subject: rpms/gkrellmms/devel gkrellmms.spec,1.8,1.9
Message-ID: <200602141751.k1EHp9fZ016964@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	gkrellmms.spec 
Log Message:
* Tue Feb 14 2006 Brian Pepple  - 2.1.22-5
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gkrellmms.spec	16 Jan 2006 16:05:33 -0000	1.8
+++ gkrellmms.spec	14 Feb 2006 17:50:36 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           gkrellmms
 Version:        2.1.22
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Brian Pepple  - 2.1.22-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Brian Pepple  - 2.1.22-4
 - Add macros.
 - Use standard buildroot.



From fedora-extras-commits at redhat.com  Tue Feb 14 17:55:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 14 Feb 2006 12:55:31 -0500
Subject: rpms/python-reportlab/devel python-reportlab.spec,1.8,1.9
Message-ID: <200602141756.k1EHu3Ge017047@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	python-reportlab.spec 
Log Message:
* Tue Feb 14 2006 Brian Pepple  - 1.20-5
- rebuilt for new gcc4.1 snapshot and glibc changes



Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/python-reportlab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-reportlab.spec	26 Dec 2005 23:49:29 -0000	1.8
+++ python-reportlab.spec	14 Feb 2006 17:55:31 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:		python-reportlab
 Version:	1.20
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Brian Pepple  - 1.20-5
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 26 2005 Brian Pepple  - 1.20-4
 - Add dist tag. (#176479)
 



From fedora-extras-commits at redhat.com  Tue Feb 14 17:58:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 14 Feb 2006 12:58:34 -0500
Subject: rpms/digikamimageplugins/devel digikamimageplugins.spec,1.12,1.13
Message-ID: <200602141759.k1EHx6oo017108@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	digikamimageplugins.spec 
Log Message:
* Tue Feb 14 2006 Rex Dieter 
- BR: %version <= digikam < 0.9



Index: digikamimageplugins.spec
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/devel/digikamimageplugins.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- digikamimageplugins.spec	10 Feb 2006 14:22:18 -0000	1.12
+++ digikamimageplugins.spec	14 Feb 2006 17:58:34 -0000	1.13
@@ -2,7 +2,7 @@
 Name:    digikamimageplugins
 Summary: Plugins for Digikam
 Version: 0.8.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia
@@ -15,9 +15,11 @@
 BuildRequires: gettext
 BuildRequires: libxml2
 BuildRequires: kdelibs-devel >= 6:3.4
-BuildRequires: digikam-devel = %{version}
+BuildRequires: digikam-devel >= %{version}
+BuildRequires: digikam-devel < 0.9
 
 Requires: digikam >= %{version}
+#Requires: digikam < 0.9
 Requires: ImageMagick 
 
 
@@ -129,6 +131,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Rex Dieter 
+- BR: %%version <= digikam < 0.9
+
 * Fri Feb 10 2006 Rex Dieter 
 - fc5: gcc/glibc respin
 



From fedora-extras-commits at redhat.com  Tue Feb 14 18:05:47 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 14 Feb 2006 13:05:47 -0500
Subject: rpms/enchant/devel enchant.spec,1.8,1.9
Message-ID: <200602141806.k1EI6MSF019052@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	enchant.spec 
Log Message:
Rebuild for FC Extras 5




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- enchant.spec	5 Feb 2006 21:32:46 -0000	1.8
+++ enchant.spec	14 Feb 2006 18:05:47 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -61,6 +61,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 14 2006 Marc Maurer  1:1.2.2-2.fc5
+- Rebuild for Fedora Extras 5
+
 * Sun Feb 05 2006 Marc Maurer  1:1.2.2-1.fc5
 - Update to 1.2.2
 



From fedora-extras-commits at redhat.com  Tue Feb 14 18:06:15 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Feb 2006 13:06:15 -0500
Subject: rpms/dvdisaster/devel dvdisaster.spec,1.6,1.7
Message-ID: <200602141806.k1EI6lJa019069@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dvdisaster.spec	31 Jan 2006 14:14:27 -0000	1.6
+++ dvdisaster.spec	14 Feb 2006 18:06:14 -0000	1.7
@@ -1,7 +1,7 @@
 Name: dvdisaster
 Summary: CD/DVD media data loss/scratch/aging protection
 Version: 0.65
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Dmitry Butskoy  - 0.65-2
+- rebuild for FC5
+
 * Tue Jan 31 2006 Dmitry Butskoy  - 0.65-1
 - upgrade to 0.65
 - drop browser patch (no more needed)



From fedora-extras-commits at redhat.com  Tue Feb 14 18:08:34 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Feb 2006 13:08:34 -0500
Subject: rpms/enca/devel enca.spec,1.3,1.4
Message-ID: <200602141808.k1EI8ttS019166@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	enca.spec 
Log Message:



Index: enca.spec
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/enca.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- enca.spec	19 Dec 2005 15:57:22 -0000	1.3
+++ enca.spec	14 Feb 2006 18:08:34 -0000	1.4
@@ -1,7 +1,7 @@
 Name: enca
 Summary: Character set analyzer and detector
 Version: 1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Text
 Source: http://trific.ath.cx/Ftp/enca/enca-%{version}.tar.bz2
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Dmitry Butskoy  - 1.9-2
+- rebuild for FC5
+
 * Mon Dec 19 2005 Dmitry Butskoy  - 1.9-1
 - upgrade to 1.9
 



From fedora-extras-commits at redhat.com  Tue Feb 14 18:10:34 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Feb 2006 13:10:34 -0500
Subject: rpms/gtk-gnutella/devel gtk-gnutella.spec,1.4,1.5
Message-ID: <200602141811.k1EIB7jE019227@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19210

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk-gnutella.spec	31 Jan 2006 17:54:19 -0000	1.4
+++ gtk-gnutella.spec	14 Feb 2006 18:10:34 -0000	1.5
@@ -2,7 +2,7 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
 Version: 0.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Dmitry Butskoy  - 0.96-2
+- rebuild for FC5
+
 * Tue Jan 31 2006 Dmitry Butskoy  - 0.96-1
 - upgrade to 0.96
 



From fedora-extras-commits at redhat.com  Tue Feb 14 18:49:51 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Feb 2006 13:49:51 -0500
Subject: rpms/krusader/FC-3 .cvsignore, 1.3, 1.4 krusader.spec, 1.4,
	1.5 sources, 1.3, 1.4 krusader-1.60.0-desktop.patch, 1.2,
	NONE krusader-1.60.0-gcc4.patch, 1.1,
	NONE krusader-1.60.0-newline.patch, 1.1, NONE
Message-ID: <200602141850.k1EIoOrZ019428@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore krusader.spec sources 
Removed Files:
	krusader-1.60.0-desktop.patch krusader-1.60.0-gcc4.patch 
	krusader-1.60.0-newline.patch 
Log Message:
- Remove all patches (merged upstream)
- Updated to version 1.70.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Dec 2005 20:46:38 -0000	1.3
+++ .cvsignore	14 Feb 2006 18:49:51 -0000	1.4
@@ -1,2 +1 @@
-krusader-1.60.0.tar.gz
-krusader-1.60.1.tar.gz
+krusader-1.70.0.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/krusader.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krusader.spec	12 Dec 2005 20:46:38 -0000	1.4
+++ krusader.spec	14 Feb 2006 18:49:51 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		krusader
-Version:	1.60.1
+Version:	1.70.0
 Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
@@ -7,15 +7,11 @@
 License:	GPL
 URL:		http://krusader.sourceforge.net/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		krusader-1.60.0-desktop.patch
-Patch1:		krusader-1.60.0-gcc4.patch
-Patch2:		krusader-1.60.0-newline.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs-devel >= 3.3.0 qt-devel >= 3.3.0 arts-devel >= 1.3.0
-BuildRequires:	kdebase-devel >= 3.3.0 kdebindings-devel >= 3.3.0 gamin-devel
-BuildRequires:	libpng-devel libselinux-devel automake desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	qt-devel kdelibs-devel kdebase-devel kdebindings-devel
+BuildRequires:	desktop-file-utils automake gettext
+BuildRequires:	arts-devel libpng-devel gamin-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -35,17 +31,15 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %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-rpath \
+	--disable-debug \
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -55,7 +49,7 @@
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Applications/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/applnk/*.desktop
 
 # Workaround for some wicked install bug
 rm -rf $RPM_BUILD_ROOT%{_tmppath}
@@ -70,17 +64,27 @@
 %post
 update-desktop-database &> /dev/null ||:
 
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+
+touch --no-create %{_datadir}/icons/locolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
 fi
 
 %postun
 update-desktop-database &> /dev/null ||:
 
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+
+touch --no-create %{_datadir}/icons/locolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
 fi
 
 %clean
@@ -96,52 +100,73 @@
 %{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
 %{_datadir}/apps/krusader/
 %{_datadir}/config/kio_isorc
-%{_datadir}/doc/HTML/en/*
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/doc/HTML/en/krusader/
+%{_datadir}/icons/crystalsvg/*/apps/*
+%{_datadir}/icons/locolor/*/apps/*
 %{_mandir}/man1/krusader.1*
 %{_datadir}/services/iso.protocol
 %{_datadir}/services/krarc.protocol
 
 %changelog
-* Mon Dec 12 2005 Marcin Garski  1.60.1-1
+* Mon Feb 13 2006 Marcin Garski  1.70.0-1
+- Remove all patches (merged upstream)
+- Updated to version 1.70.0
+
+* Mon Jan 16 2006 Marcin Garski  1.60.1-6
+- Remove --enable-final
+
+* Mon Jan 16 2006 Marcin Garski  1.60.1-5
+- Remove --disable-dependency-tracking
+
+* Sun Jan 15 2006 Marcin Garski  1.60.1-4
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-debug --disable-dependency-tracking & --enable-final
+
+* Wed Dec 14 2005 Marcin Garski  1.60.1-3
+- Add to BR libacl-devel
+
+* Tue Dec 13 2005 Marcin Garski  1.60.1-2
+- Fix for modular X.Org
+
+* Mon Dec 12 2005 Marcin Garski  1.60.1-1
 - Updated to version 1.60.1 which fix CVE-2005-3856
 
-* Sun Oct 23 2005 Marcin Garski  1.60.0-4
+* Sun Oct 23 2005 Marcin Garski  1.60.0-4
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 
-* Thu Aug 25 2005 Marcin Garski  1.60.0-3
+* Thu Aug 25 2005 Marcin Garski  1.60.0-3
 - Include .la files
 - Include actions_tutorial.txt
 - Fix krusader_root-mode.desktop file to show only in KDE and under System
   category
 - Fix compile warnings
 
-* Fri Aug 12 2005 Marcin Garski  1.60.0-2
+* Fri Aug 12 2005 Marcin Garski  1.60.0-2
 - Spec improvements for Fedora Extras
 
-* Wed Aug 10 2005 Marcin Garski  1.60.0-1
+* Wed Aug 10 2005 Marcin Garski  1.60.0-1
 - Updated to version 1.60.0 & clean up for Fedora Extras
 
-* Fri Dec 17 2004 Marcin Garski  1.51.fc2kde331
+* Fri Dec 17 2004 Marcin Garski  1.51.fc2kde331
 - Updated to version 1.51
 
-* Sat Nov 11 2004 Marcin Garski  1.50.fc2kde331
+* Sat Nov 11 2004 Marcin Garski  1.50.fc2kde331
 - Added Requires:
 
-* Tue Nov 02 2004 Marcin Garski  1.50.fc2
+* Tue Nov 02 2004 Marcin Garski  1.50.fc2
 - Updated to version 1.50 & spec cleanup
 
-* Fri Aug 06 2004 Marcin Garski  1.40-1.fc2
+* Fri Aug 06 2004 Marcin Garski  1.40-1.fc2
 - Updated to version 1.40
 
-* Wed Jun 23 2004 Marcin Garski  1.40-beta2.fc2
+* Wed Jun 23 2004 Marcin Garski  1.40-beta2.fc2
 - Updated to version 1.40-beta2
 
-* Wed Jun 02 2004 Marcin Garski  1.40-beta1.fc2
+* Wed Jun 02 2004 Marcin Garski  1.40-beta1.fc2
 - Rebuild for Fedora Core 2 & huge spec cleanup
 
-* Mon Nov 17 2003 11:05:00 Marian POPESCU  [1.30]
+* Mon Nov 17 2003 11:05:00 Marian POPESCU  [1.30]
 - Updated to 1.30 release + changed description to match the official one
 
-* Tue Jul 03 2003 17:00:00 Marcin Garski  [1.20]
+* Tue Jul 03 2003 17:00:00 Marcin Garski  [1.20]
 - Initial specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Dec 2005 20:46:38 -0000	1.3
+++ sources	14 Feb 2006 18:49:51 -0000	1.4
@@ -1,2 +1 @@
-95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
-18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz
+3c2d73637c72e1042fef52ad1a336a64  krusader-1.70.0.tar.gz


--- krusader-1.60.0-desktop.patch DELETED ---


--- krusader-1.60.0-gcc4.patch DELETED ---


--- krusader-1.60.0-newline.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb 14 18:51:54 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Feb 2006 13:51:54 -0500
Subject: rpms/krusader/FC-4 .cvsignore, 1.3, 1.4 krusader.spec, 1.4,
	1.5 sources, 1.3, 1.4 krusader-1.60.0-desktop.patch, 1.2,
	NONE krusader-1.60.0-gcc4.patch, 1.1,
	NONE krusader-1.60.0-newline.patch, 1.1, NONE
Message-ID: <200602141852.k1EIqRSF019515@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore krusader.spec sources 
Removed Files:
	krusader-1.60.0-desktop.patch krusader-1.60.0-gcc4.patch 
	krusader-1.60.0-newline.patch 
Log Message:
- Remove all patches (merged upstream)
- Updated to version 1.70.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Dec 2005 20:51:10 -0000	1.3
+++ .cvsignore	14 Feb 2006 18:51:54 -0000	1.4
@@ -1,2 +1 @@
-krusader-1.60.0.tar.gz
-krusader-1.60.1.tar.gz
+krusader-1.70.0.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/krusader.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krusader.spec	12 Dec 2005 20:51:10 -0000	1.4
+++ krusader.spec	14 Feb 2006 18:51:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		krusader
-Version:	1.60.1
+Version:	1.70.0
 Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
@@ -7,15 +7,11 @@
 License:	GPL
 URL:		http://krusader.sourceforge.net/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		krusader-1.60.0-desktop.patch
-Patch1:		krusader-1.60.0-gcc4.patch
-Patch2:		krusader-1.60.0-newline.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs-devel >= 3.3.0 qt-devel >= 3.3.0 arts-devel >= 1.3.0
-BuildRequires:	kdebase-devel >= 3.3.0 kdebindings-devel >= 3.3.0 gamin-devel
-BuildRequires:	libpng-devel libselinux-devel automake desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	qt-devel kdelibs-devel kdebase-devel kdebindings-devel
+BuildRequires:	desktop-file-utils automake gettext
+BuildRequires:	arts-devel libpng-devel gamin-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -35,17 +31,15 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %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-rpath \
+	--disable-debug \
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -55,7 +49,7 @@
 desktop-file-install --vendor fedora --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Applications/*.desktop
+	$RPM_BUILD_ROOT%{_datadir}/applnk/*.desktop
 
 # Workaround for some wicked install bug
 rm -rf $RPM_BUILD_ROOT%{_tmppath}
@@ -70,17 +64,27 @@
 %post
 update-desktop-database &> /dev/null ||:
 
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+
+touch --no-create %{_datadir}/icons/locolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
 fi
 
 %postun
 update-desktop-database &> /dev/null ||:
 
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+
+touch --no-create %{_datadir}/icons/locolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
 fi
 
 %clean
@@ -96,52 +100,73 @@
 %{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
 %{_datadir}/apps/krusader/
 %{_datadir}/config/kio_isorc
-%{_datadir}/doc/HTML/en/*
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/doc/HTML/en/krusader/
+%{_datadir}/icons/crystalsvg/*/apps/*
+%{_datadir}/icons/locolor/*/apps/*
 %{_mandir}/man1/krusader.1*
 %{_datadir}/services/iso.protocol
 %{_datadir}/services/krarc.protocol
 
 %changelog
-* Mon Dec 12 2005 Marcin Garski  1.60.1-1
+* Mon Feb 13 2006 Marcin Garski  1.70.0-1
+- Remove all patches (merged upstream)
+- Updated to version 1.70.0
+
+* Mon Jan 16 2006 Marcin Garski  1.60.1-6
+- Remove --enable-final
+
+* Mon Jan 16 2006 Marcin Garski  1.60.1-5
+- Remove --disable-dependency-tracking
+
+* Sun Jan 15 2006 Marcin Garski  1.60.1-4
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-debug --disable-dependency-tracking & --enable-final
+
+* Wed Dec 14 2005 Marcin Garski  1.60.1-3
+- Add to BR libacl-devel
+
+* Tue Dec 13 2005 Marcin Garski  1.60.1-2
+- Fix for modular X.Org
+
+* Mon Dec 12 2005 Marcin Garski  1.60.1-1
 - Updated to version 1.60.1 which fix CVE-2005-3856
 
-* Sun Oct 23 2005 Marcin Garski  1.60.0-4
+* Sun Oct 23 2005 Marcin Garski  1.60.0-4
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 
-* Thu Aug 25 2005 Marcin Garski  1.60.0-3
+* Thu Aug 25 2005 Marcin Garski  1.60.0-3
 - Include .la files
 - Include actions_tutorial.txt
 - Fix krusader_root-mode.desktop file to show only in KDE and under System
   category
 - Fix compile warnings
 
-* Fri Aug 12 2005 Marcin Garski  1.60.0-2
+* Fri Aug 12 2005 Marcin Garski  1.60.0-2
 - Spec improvements for Fedora Extras
 
-* Wed Aug 10 2005 Marcin Garski  1.60.0-1
+* Wed Aug 10 2005 Marcin Garski  1.60.0-1
 - Updated to version 1.60.0 & clean up for Fedora Extras
 
-* Fri Dec 17 2004 Marcin Garski  1.51.fc2kde331
+* Fri Dec 17 2004 Marcin Garski  1.51.fc2kde331
 - Updated to version 1.51
 
-* Sat Nov 11 2004 Marcin Garski  1.50.fc2kde331
+* Sat Nov 11 2004 Marcin Garski  1.50.fc2kde331
 - Added Requires:
 
-* Tue Nov 02 2004 Marcin Garski  1.50.fc2
+* Tue Nov 02 2004 Marcin Garski  1.50.fc2
 - Updated to version 1.50 & spec cleanup
 
-* Fri Aug 06 2004 Marcin Garski  1.40-1.fc2
+* Fri Aug 06 2004 Marcin Garski  1.40-1.fc2
 - Updated to version 1.40
 
-* Wed Jun 23 2004 Marcin Garski  1.40-beta2.fc2
+* Wed Jun 23 2004 Marcin Garski  1.40-beta2.fc2
 - Updated to version 1.40-beta2
 
-* Wed Jun 02 2004 Marcin Garski  1.40-beta1.fc2
+* Wed Jun 02 2004 Marcin Garski  1.40-beta1.fc2
 - Rebuild for Fedora Core 2 & huge spec cleanup
 
-* Mon Nov 17 2003 11:05:00 Marian POPESCU  [1.30]
+* Mon Nov 17 2003 11:05:00 Marian POPESCU  [1.30]
 - Updated to 1.30 release + changed description to match the official one
 
-* Tue Jul 03 2003 17:00:00 Marcin Garski  [1.20]
+* Tue Jul 03 2003 17:00:00 Marcin Garski  [1.20]
 - Initial specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Dec 2005 20:51:10 -0000	1.3
+++ sources	14 Feb 2006 18:51:54 -0000	1.4
@@ -1,2 +1 @@
-95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
-18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz
+3c2d73637c72e1042fef52ad1a336a64  krusader-1.70.0.tar.gz


--- krusader-1.60.0-desktop.patch DELETED ---


--- krusader-1.60.0-gcc4.patch DELETED ---


--- krusader-1.60.0-newline.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb 14 19:25:15 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Feb 2006 14:25:15 -0500
Subject: rpms/libgda/devel libgda-1.9.100-sharp.patch, 1.1,
	1.2 libgda-1.9.100-syslibs.patch, 1.1, 1.2 libgda.spec, 1.10, 1.11
Message-ID: <200602141925.k1EJPlel021508@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	libgda-1.9.100-sharp.patch libgda-1.9.100-syslibs.patch 
	libgda.spec 
Log Message:
* 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
- Make sqlite plugin a seperate package again
- Attempt to properly install C-sharp/mono bindings
- Add %{?dist} for consistency with my other packages
- Remove static lib from -devel package


libgda-1.9.100-sharp.patch:

Index: libgda-1.9.100-sharp.patch
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda-1.9.100-sharp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgda-1.9.100-sharp.patch	16 Jan 2006 22:04:11 -0000	1.1
+++ libgda-1.9.100-sharp.patch	14 Feb 2006 19:25:15 -0000	1.2
@@ -5,3 +5,23 @@
 -  
 +  
  
+--- libgda-1.9.100/gda-sharp/gda-sharp-2.0.pc.in~	2006-02-13 21:43:19.000000000 +0100
++++ libgda-1.9.100/gda-sharp/gda-sharp-2.0.pc.in	2006-02-13 21:59:35.000000000 +0100
+@@ -1,12 +1,12 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-pkglibdir=${libdir}/libgda
++libdir=${exec_prefix}/lib
++gapidir=${prefix}/share/gapi-2.0
++
+ 
+ Name: gda-sharp-2.0
+ Description: GDA (GNOME Data Access) library C# binding
+ Requires: gtk-sharp-2.0
+ Version: @VERSION@
+-Cflags: -I:${pkglibdir}/gda-api.xml
+-Libraries=${pkglibdir}/gda-sharp.dll ${pkglibdir}/gda-sharp.dll.config
+-Libs: -r:gda-sharp.dll
++Cflags: -I:${gapidir}/gda-api.xml
++Libs: -r:${libdir}/mono/gda-sharp-2.0/gda-sharp.dll

libgda-1.9.100-syslibs.patch:

Index: libgda-1.9.100-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda-1.9.100-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgda-1.9.100-syslibs.patch	13 Feb 2006 16:37:53 -0000	1.1
+++ libgda-1.9.100-syslibs.patch	14 Feb 2006 19:25:15 -0000	1.2
@@ -1,5 +1,122 @@
---- libgda-1.9.100/providers/sqlite/Makefile.am~	2006-02-13 17:31:19.000000000 +0100
-+++ libgda-1.9.100/providers/sqlite/Makefile.am	2006-02-13 17:32:21.000000000 +0100
+--- libgda-1.9.100/libgda/gda-data-model-private.h.syslibs	2005-09-21 22:06:54.000000000 +0200
++++ libgda-1.9.100/libgda/gda-data-model-private.h	2006-02-13 23:01:32.000000000 +0100
+@@ -21,8 +21,8 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#if !defined(__gda_data_model_h__)
+-#  define __gda_data_model_h__
++#if !defined(__gda_data_model_private_h__)
++#  define __gda_data_model_private_h__
+ 
+ #include 
+ #include 
+--- libgda-1.9.100/providers/sqlite/utils.c.syslibs	2006-02-13 23:04:39.000000000 +0100
++++ libgda-1.9.100/providers/sqlite/utils.c	2006-02-13 23:06:30.000000000 +0100
+@@ -25,8 +25,8 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include "gda-sqlite.h"
+-#include "sqliteInt.h"
+ 
+ void
+ gda_sqlite_update_types_hash (SQLITEcnc *scnc)
+@@ -38,6 +38,7 @@
+ 		scnc->types = types;
+ 	}
+ 
++#if 0
+ 	if (SQLITE_VERSION_NUMBER >= 3000000) {
+ 		Db *db;
+ 		gint i;
+@@ -86,6 +87,7 @@
+ 			}
+ 		}
+ 	}
++#endif	
+ }
+ 
+ void
+--- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c.syslibs	2005-09-28 13:39:45.000000000 +0200
++++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c	2006-02-13 23:01:32.000000000 +0100
+@@ -26,6 +26,8 @@
+ #endif
+ 
+ #include 
++#include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -33,7 +35,6 @@
+ #include "gda-sqlite.h"
+ #include "gda-sqlite-provider.h"
+ #include "gda-sqlite-recordset.h"
+-#include "sqliteInt.h"
+ 
+ static void gda_sqlite_provider_class_init (GdaSqliteProviderClass *klass);
+ static void gda_sqlite_provider_init       (GdaSqliteProvider *provider,
+@@ -260,6 +261,7 @@
+ 		}
+ 	}
+ 
++#if 0
+ 	if (0) {
+ 		/* show all databases in this handle */
+ 		Db *db;
+@@ -270,6 +272,7 @@
+ 			g_print ("/// %s\n", db->zName);
+ 		}
+ 	}
++#endif
+ 
+ 	return TRUE;
+ }
+@@ -1054,6 +1057,7 @@
+ 
+ 		/* extra attributes */
+ 		nvalue = NULL;
++#if 0
+ 		if (SQLITE_VERSION_NUMBER >= 3000000) {
+ 			Table *table;
+ 				
+@@ -1066,6 +1070,7 @@
+ 			if ((table->iPKey == i) && table->autoInc)
+ 				nvalue = gda_value_new_string ("AUTO_INCREMENT");
+ 		}
++#endif
+ 
+ 		if (!nvalue)
+ 			nvalue = gda_value_new_null ();
+@@ -1155,7 +1160,7 @@
+ 		gda_connection_add_event_string (cnc, _("Invalid SQLITE handle"));
+ 		return NULL;
+ 	}
+-	g_assert ((scnc->connection->flags & SQLITE_Initialized) || scnc->connection->init.busy);
++/*	g_assert ((scnc->connection->flags & SQLITE_Initialized) || scnc->connection->init.busy); */
+ 
+ 	/* create the recordset */
+ 	recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new 
+@@ -1204,6 +1209,7 @@
+ 		g_assert (gda_provider_init_schema_model (GDA_DATA_MODEL (recset), GDA_CONNECTION_SCHEMA_PROCEDURES));
+ 	}
+ 
++#if 0
+ 	if (SQLITE_VERSION_NUMBER >= 3000000) {
+ 		Hash *func_hash;
+ 		HashElem *func_elem;
+@@ -1290,6 +1296,7 @@
+ 		g_list_foreach (list, add_g_list_row, recset);
+ 		g_list_free (list);
+ 	}
++#endif
+ 
+ 	return GDA_DATA_MODEL (recset);
+ }
+--- libgda-1.9.100/providers/sqlite/Makefile.am.syslibs	2005-06-01 21:14:12.000000000 +0200
++++ libgda-1.9.100/providers/sqlite/Makefile.am	2006-02-13 23:01:32.000000000 +0100
 @@ -1,4 +1,4 @@
 -SUBDIRS = sqlite-src
 +SUBDIRS = 
@@ -15,3 +132,13 @@
 +	$(top_builddir)/libgda/libgda-3.la -lsqlite3
  
  EXTRA_DIST = $(config_DATA)
+--- libgda-1.9.100/configure.in.syslibs	2006-02-13 23:01:32.000000000 +0100
++++ libgda-1.9.100/configure.in	2006-02-13 23:01:32.000000000 +0100
+@@ -981,7 +981,6 @@
+ providers/oracle/Makefile
+ providers/postgres/Makefile
+ providers/sqlite/Makefile
+-providers/sqlite/sqlite-src/Makefile
+ providers/sybase/Makefile
+ providers/xbase/Makefile
+ report/Makefile


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgda.spec	13 Feb 2006 16:37:53 -0000	1.10
+++ libgda.spec	14 Feb 2006 19:25:15 -0000	1.11
@@ -35,7 +35,7 @@
 Summary:          Library for writing gnome database programs
 Name:             libgda
 Version:          1.9.100
-Release: 	  3
+Release: 	  4%{?dist}
 Epoch:		  1
 Source:           %{name}-%{version}.tar.bz2
 URL:              http://www.gnome-db.org/
@@ -47,7 +47,7 @@
 BuildRequires:    libxslt-devel >= 1.0.9
 BuildRequires:    libxml2-devel ncurses-devel scrollkeeper groff readline-devel
 BuildRequires:    db4-devel gtk-doc mono-devel gtk-sharp2 gtk-sharp2-gapi
-BuildRequires:    sqlite-devel
+BuildRequires:	  sqlite-devel
 
 %if %{FREETDS}
 BuildRequires:    freetds-devel
@@ -105,6 +105,15 @@
 applications which use libgda.
 
 
+%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}
+
+
 %if %{FREETDS}
 %package freetds
 Summary:	libgda FreeTDS Provider
@@ -195,6 +204,7 @@
 Provides:	gda-ldap = %{epoch}:%{version}-%{release}
 %endif
 
+
 %prep
 %setup -q
 rm -fr providers/sqlite/sqlite-src
@@ -202,6 +212,7 @@
 %patch1 -p1 -b .sharp
 %patch2 -p1 -b .syslibs
 
+
 %build
 aclocal
 automake
@@ -263,17 +274,26 @@
 %configure $CONFIG
 make
 
+
 %install
 rm -rf %{buildroot}
 %makeinstall
 
+#fixup mono / sharp related files install
+mkdir -p %{buildroot}/%{_datadir}/gapi-2.0
+mv %{buildroot}/%{_libdir}/libgda/gda-api.xml %{buildroot}/%{_datadir}/gapi-2.0
+mkdir -p %{buildroot}/usr/lib/mono/gda-sharp-2.0
+mv %{buildroot}/%{_libdir}/libgda/* %{buildroot}/usr/lib/mono/gda-sharp-2.0
+rmdir %{buildroot}/%{_libdir}/libgda
+
 # Cleanup unnecessary, unpackaged files
 rm -f %{buildroot}/%{_libdir}/libgda-1.9/providers/*.{a,la}
-rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/*.{a,la}
 rm -f %{buildroot}/%{_sysconfdir}/libgda/sales_test.db
 
 %find_lang libgda-3
 
+
 %post -p /sbin/ldconfig
 
 %post devel
@@ -298,7 +318,8 @@
 %{_libdir}/*.so.*
 %dir %{_libdir}/libgda-1.9
 %dir %{_libdir}/libgda-1.9/providers
-%{_libdir}/libgda-1.9/providers/libgda-sqlite.so
+# note this file really should be in its own subpackage too, but libgda
+# needs to have atleast one provider present to be of any use.
 %{_libdir}/libgda-1.9/providers/libgda-bdb.so
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -307,15 +328,19 @@
 %defattr(-,root,root)
 %doc %{_datadir}/gtk-doc/html/libgda
 %{_includedir}/*
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libgda-2.0.pc
 
 %files sharp
 %defattr(-,root,root)
-%{_libdir}/libgda
+%{_datadir}/gapi-2.0
+/usr/lib/mono/gda-sharp-2.0
 %{_libdir}/pkgconfig/gda-sharp-2.0.pc
 
+%files sqlite
+%defattr(-,root,root)
+%{_libdir}/libgda-1.9/providers/libgda-sqlite.so
+
 %if %{FREETDS}
 %files freetds
 %defattr(-,root,root)
@@ -372,6 +397,14 @@
 
 
 %changelog
+* 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
+- Make sqlite plugin a seperate package again
+- Attempt to properly install C-sharp/mono bindings
+- Add %%{?dist} for consistency with my other packages
+- Remove static lib from -devel package
+
 * Tue Jan 17 2006 Hans de Goede  1:1.9.100-3
 - Make -sharp package Require the main package.
 



From fedora-extras-commits at redhat.com  Tue Feb 14 20:07:25 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 14 Feb 2006 15:07:25 -0500
Subject: rpms/glpk/devel .cvsignore, 1.2, 1.3 glpk.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200602142007.k1EK7xKp023671@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	.cvsignore glpk.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Aug 2005 15:07:34 -0000	1.2
+++ .cvsignore	14 Feb 2006 20:07:24 -0000	1.3
@@ -1 +1 @@
-glpk-4.8.tar.gz
+glpk-4.9.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glpk.spec	13 Sep 2005 15:31:07 -0000	1.3
+++ glpk.spec	14 Feb 2006 20:07:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glpk
-Version:        4.8
-Release:        3
+Version:        4.9
+Release:        1
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 14 2006 Quentin Spencer  4.9-1
+- New release.
+
 * Tue Aug 09 2005 Quentin Spencer  4.8-3
 - Remove utils dependency on base package, since it doesn't exist until
   shared libraries are enabled.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Aug 2005 15:07:34 -0000	1.2
+++ sources	14 Feb 2006 20:07:24 -0000	1.3
@@ -1 +1 @@
-ec4df7a56a4ed98369c9f0bc7c82322b  glpk-4.8.tar.gz
+e1aecaf58adaaf155d178a95e46f8d77  glpk-4.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 20:12:40 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 14 Feb 2006 15:12:40 -0500
Subject: rpms/glpk/FC-4 .cvsignore, 1.2, 1.3 glpk.spec, 1.3, 1.4 sources, 1.2,
	1.3
Message-ID: <200602142013.k1EKDCMl023772@cvs-int.fedora.redhat.com>

Author: qspencer

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

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Aug 2005 15:07:34 -0000	1.2
+++ .cvsignore	14 Feb 2006 20:12:40 -0000	1.3
@@ -1 +1 @@
-glpk-4.8.tar.gz
+glpk-4.9.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/extras/rpms/glpk/FC-4/glpk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glpk.spec	13 Sep 2005 15:31:07 -0000	1.3
+++ glpk.spec	14 Feb 2006 20:12:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glpk
-Version:        4.8
-Release:        3
+Version:        4.9
+Release:        1
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 14 2006 Quentin Spencer  4.9-1
+- New release.
+
 * Tue Aug 09 2005 Quentin Spencer  4.8-3
 - Remove utils dependency on base package, since it doesn't exist until
   shared libraries are enabled.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpk/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Aug 2005 15:07:34 -0000	1.2
+++ sources	14 Feb 2006 20:12:40 -0000	1.3
@@ -1 +1 @@
-ec4df7a56a4ed98369c9f0bc7c82322b  glpk-4.8.tar.gz
+e1aecaf58adaaf155d178a95e46f8d77  glpk-4.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 20:22:44 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 14 Feb 2006 15:22:44 -0500
Subject: rpms/glpk/FC-4 glpk.spec,1.4,1.5
Message-ID: <200602142023.k1EKNGnG023879@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	glpk.spec 
Log Message:
Add dist tag.


Index: glpk.spec
===================================================================
RCS file: /cvs/extras/rpms/glpk/FC-4/glpk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glpk.spec	14 Feb 2006 20:12:40 -0000	1.4
+++ glpk.spec	14 Feb 2006 20:22:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glpk
 Version:        4.9
-Release:        1
+Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -88,6 +88,7 @@
 %changelog
 * Tue Feb 14 2006 Quentin Spencer  4.9-1
 - New release.
+- Add dist tag.
 
 * Tue Aug 09 2005 Quentin Spencer  4.8-3
 - Remove utils dependency on base package, since it doesn't exist until



From fedora-extras-commits at redhat.com  Tue Feb 14 20:25:59 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 14 Feb 2006 15:25:59 -0500
Subject: rpms/glpk/devel glpk.spec,1.4,1.5
Message-ID: <200602142026.k1EKQcOP023921@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	glpk.spec 
Log Message:
Add dist tag.


Index: glpk.spec
===================================================================
RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glpk.spec	14 Feb 2006 20:07:24 -0000	1.4
+++ glpk.spec	14 Feb 2006 20:25:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glpk
 Version:        4.9
-Release:        1
+Release:        2%{?dist}
 Summary:        GNU Linear Programming Kit
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 14 2006 Quentin Spencer  4.9-2
+- Add dist tag
+
 * Tue Feb 14 2006 Quentin Spencer  4.9-1
 - New release.
 



From fedora-extras-commits at redhat.com  Tue Feb 14 20:29:59 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Feb 2006 15:29:59 -0500
Subject: rpms/lirc/devel lirc-0.8.0-rpath64.patch, NONE, 1.1 lirc.spec, 1.14,
	1.15
Message-ID: <200602142030.k1EKUViL024053@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	lirc.spec 
Added Files:
	lirc-0.8.0-rpath64.patch 
Log Message:
* Tue Feb 14 2006 Ville Skytt??  - 0.8.0-3
- Avoid standard rpaths on lib64 archs.


lirc-0.8.0-rpath64.patch:

--- NEW FILE lirc-0.8.0-rpath64.patch ---
--- lirc-0.8.0/configure~	2006-01-21 11:03:45.000000000 +0200
+++ lirc-0.8.0/configure	2006-02-14 22:19:00.000000000 +0200
@@ -4282,7 +4282,7 @@
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 
 case $host_os in
--- lirc-0.8.0/aclocal.m4~	2006-01-21 11:03:43.000000000 +0200
+++ lirc-0.8.0/aclocal.m4	2006-02-14 22:19:11.000000000 +0200
@@ -2531,7 +2531,7 @@
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 
 case $host_os in


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lirc.spec	21 Jan 2006 15:13:25 -0000	1.14
+++ lirc.spec	14 Feb 2006 20:29:59 -0000	1.15
@@ -10,7 +10,7 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -20,6 +20,7 @@
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
+Patch1:         %{name}-0.8.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -52,9 +53,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
-touch -r aclocal.m4 configure.in # avoid autofoo re-run
+touch -r acconfig.h aclocal.m4 configure.in # avoid autofoo re-run
 
 
 %build
@@ -138,6 +140,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Ville Skytt??  - 0.8.0-3
+- Avoid standard rpaths on lib64 archs.
+
 * Sat Jan 21 2006 Ville Skytt??  - 0.8.0-2
 - 0.8.0.
 



From fedora-extras-commits at redhat.com  Tue Feb 14 20:34:44 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 14 Feb 2006 15:34:44 -0500
Subject: fedora-security/audit fc4,1.152,1.153 fc5,1.61,1.62
Message-ID: <200602142034.k1EKYiGv024224@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	fc4 fc5 
Log Message:
Note two new postgresql issues.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- fc4	13 Feb 2006 08:52:46 -0000	1.152
+++ fc4	14 Feb 2006 20:34:36 -0000	1.153
@@ -3,9 +3,11 @@
 
 ** are items that need attention
 
+CVE-2006-0678 **postgresql
 CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107]
 CVE-2006-0591 VULNERABLE (postgresql)
 CVE-2006-0576 VULNERABLE (oprofile)
+CVE-2006-0553 **postgresql
 CVE-2006-0528 **evolution
 CVE-2006-0496 VULNERABLE (mozilla)
 CVE-2006-0496 VULNERABLE (firefox)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- fc5	13 Feb 2006 08:52:46 -0000	1.61
+++ fc5	14 Feb 2006 20:34:36 -0000	1.62
@@ -15,9 +15,11 @@
 
 ** are items that need attention
 
+CVE-2006-0678 VULNERABLE (postgresql)
 CVE-2006-0645 VULNERABLE (gnutls)
 CVE-2006-0591 VULNERABLE (postgresql)
 CVE-2006-0576 VULNERABLE (oprofile)
+CVE-2006-0553 VULNERABLE (postgresql)
 CVE-2006-0528 ** evolution [under investigation]
 CVE-2006-0496 VULNERABLE (mozilla) not fixed upstream
 CVE-2006-0496 VULNERABLE (firefox) not fixed upstream



From fedora-extras-commits at redhat.com  Tue Feb 14 20:37:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Feb 2006 15:37:17 -0500
Subject: rpms/perl-IO-Tty/devel perl-IO-Tty.spec,1.8,1.9
Message-ID: <200602142037.k1EKbnYk024267@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IO-Tty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24247

Modified Files:
	perl-IO-Tty.spec 
Log Message:
* Tue Feb 14 2006 Ville Skytt??  - 1.02-5
- Rebuild.



Index: perl-IO-Tty.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-IO-Tty.spec	17 Jan 2006 21:42:28 -0000	1.8
+++ perl-IO-Tty.spec	14 Feb 2006 20:37:17 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-IO-Tty
 Version:        1.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to pseudo tty's
 
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Ville Skytt??  - 1.02-5
+- Rebuild.
+
 * Tue Jan 17 2006 Ville Skytt??  - 1.02-4
 - Rebuild, cosmetic cleanups.
 



From fedora-extras-commits at redhat.com  Tue Feb 14 20:41:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Feb 2006 15:41:51 -0500
Subject: rpms/xmms-alarm/devel xmms-alarm.spec,1.8,1.9
Message-ID: <200602142042.k1EKgOMr024347@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-alarm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24330

Modified Files:
	xmms-alarm.spec 
Log Message:
* Tue Feb 14 2006 Ville Skytt??  - 0.3.7-2
- Rebuild, cosmetics.



Index: xmms-alarm.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-alarm/devel/xmms-alarm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xmms-alarm.spec	10 Apr 2005 17:13:47 -0000	1.8
+++ xmms-alarm.spec	14 Feb 2006 20:41:51 -0000	1.9
@@ -2,8 +2,8 @@
 
 Name:           xmms-alarm
 Version:        0.3.7
-Release:        1
-Summary:        xmms General plugin for using xmms as an alarm clock
+Release:        2%{?dist}
+Summary:        Plugin for using XMMS as an alarm clock
 
 License:        GPL
 Group:          Applications/Multimedia
@@ -11,10 +11,12 @@
 Source:         http://www.snika.uklinux.net/xmms-alarm/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xmms-devel, glib-devel >= 1:1.2.6, gtk+-devel >= 1:1.2.6
+BuildRequires:  xmms-devel
+BuildRequires:  glib-devel >= 1:1.2.6
+BuildRequires:  gtk+-devel >= 1:1.2.6
 
 %description
-xmms General plugin for using xmms as an alarm clock.
+%{summary}.
 
 
 %prep
@@ -43,6 +45,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Ville Skytt??  - 0.3.7-2
+- Rebuild, cosmetics.
+
 * Sun Apr 10 2005 Ville Skytt??  - 0.3.7-1
 - 0.3.7.
 - Build with dependency tracking disabled.



From fedora-extras-commits at redhat.com  Tue Feb 14 20:50:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 14 Feb 2006 15:50:11 -0500
Subject: rpms/lyx/devel lyx-1.4.0pre5-boost.patch, 1.1, 1.2 lyx.spec, 1.21,
	1.22
Message-ID: <200602142050.k1EKoisM024437@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	lyx-1.4.0pre5-boost.patch lyx.spec 
Log Message:
* Tue Feb 14 2006 Rex Dieter  1.4.0-0.9.pre5
- updated boost patch
- drop -fexceptions from %optflags


lyx-1.4.0pre5-boost.patch:

Index: lyx-1.4.0pre5-boost.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-1.4.0pre5-boost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.0pre5-boost.patch	13 Feb 2006 18:21:37 -0000	1.1
+++ lyx-1.4.0pre5-boost.patch	14 Feb 2006 20:50:11 -0000	1.2
@@ -1,36 +1,15 @@
---- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
-+++ lyx-1.4.0pre5/src/pch.h	2006-02-13 11:46:38.000000000 -0600
-@@ -17,7 +17,12 @@
- #include 
- #include 
- #include 
-+#include 
-+#if (BOOST_VERSION >= 103300)
-+#include 
-+#else
- #include 
-+#endif
- #include 
- #include 
- #include 
---- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
-+++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-13 11:55:22.000000000 -0600
-@@ -38,7 +38,13 @@
+--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
++++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
+@@ -20,6 +20,7 @@
+ #include "support/lstrings.h"
  
- #include 
- #include 
-+// Not sure about this one (?) -- Rex
-+#include 
-+#if (BOOST_VERSION >= 103300)
-+#include 
-+#else
  #include 
-+#endif
- 
- #include 
++#include 
  
+ #include 
+ #include 
 --- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
-+++ lyx-1.4.0pre5/src/support/pch.h	2006-02-13 11:50:33.000000000 -0600
++++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
 @@ -10,7 +10,12 @@
  #include 
  #include 
@@ -44,8 +23,18 @@
  #include 
  #include 
  
+--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
++++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
+@@ -39,6 +39,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ 
 --- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
-+++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-13 11:47:16.000000000 -0600
++++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
 @@ -14,7 +14,12 @@
  
  #include 
@@ -59,3 +48,18 @@
  
  #ifdef DEBUG
  # define TEMPORARY_DEBUG_MACRO DEBUG
+--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -17,7 +17,12 @@
+ #include 
+ #include 
+ #include 
++#include 
++#if (BOOST_VERSION >= 103300)
++#include 
++#else
+ #include 
++#endif
+ #include 
+ #include 
+ #include 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lyx.spec	13 Feb 2006 18:43:58 -0000	1.21
+++ lyx.spec	14 Feb 2006 20:50:11 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.7.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -106,6 +106,10 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 
+# drop -fexceptions from RPM_OPT_FLAGS (suggested by lyx devs)
+export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )"
+export CXXFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )"
+
 for frontend in qt xforms ; do
 
 %configure \
@@ -202,6 +206,10 @@
 
 
 %changelog
+* Tue Feb 14 2006 Rex Dieter  1.4.0-0.9.pre5
+- updated boost patch
+- drop -fexceptions from %%optflags
+
 * Mon Feb 13 2006 Rex Dieter  1.4.0-0.7.pre5
 - --without-included-boost
 - BR: boost-devel



From fedora-extras-commits at redhat.com  Tue Feb 14 20:57:44 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Tue, 14 Feb 2006 15:57:44 -0500
Subject: rpms/fping/devel fping.spec,1.4,1.5
Message-ID: <200602142058.k1EKwHCo024517@cvs-int.fedora.redhat.com>

Author: kaboom

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

Modified Files:
	fping.spec 
Log Message:
Bump and rebuild



Index: fping.spec
===================================================================
RCS file: /cvs/extras/rpms/fping/devel/fping.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fping.spec	30 Jun 2005 14:25:10 -0000	1.4
+++ fping.spec	14 Feb 2006 20:57:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name: fping
 Version: 2.4b2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Scriptable, parallelized ping-like utility
 Group: Applications/Internet
 License: BSD
@@ -43,6 +43,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 14 2006 Chris Ricker  2.4b2-6
+- Bump and rebuild
+
 * Wed Jun 29 2005 Chris Ricker  2.4b2-5
 - Clean up changelog and tags
 



From fedora-extras-commits at redhat.com  Tue Feb 14 21:03:04 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Tue, 14 Feb 2006 16:03:04 -0500
Subject: rpms/autossh/devel autossh.spec,1.2,1.3
Message-ID: <200602142103.k1EL3fWQ026399@cvs-int.fedora.redhat.com>

Author: kaboom

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

Modified Files:
	autossh.spec 
Log Message:
Bump and rebuild



Index: autossh.spec
===================================================================
RCS file: /cvs/extras/rpms/autossh/devel/autossh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autossh.spec	3 Jun 2005 06:16:30 -0000	1.2
+++ autossh.spec	14 Feb 2006 21:03:02 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Utility to autorestart SSH tunnels
 Name: autossh
 Version: 1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://www.harding.motd.ca/autossh/index.html
@@ -45,6 +45,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 14 2006 Chris Ricker  1.3-3
+- Bump and rebuild
+
 * Fri Jun 03 2005 Chris Ricker  1.3-2%{?dist}
 - Add dist tag
 



From fedora-extras-commits at redhat.com  Tue Feb 14 21:04:15 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 16:04:15 -0500
Subject: rpms/environment-modules - New directory
Message-ID: <200602142104.k1EL4HPX026435@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/environment-modules
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26427/environment-modules

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




From fedora-extras-commits at redhat.com  Tue Feb 14 21:04:21 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 16:04:21 -0500
Subject: rpms/environment-modules/devel - New directory
Message-ID: <200602142104.k1EL4aHK026449@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/environment-modules/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26427/environment-modules/devel

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




From fedora-extras-commits at redhat.com  Tue Feb 14 21:05:10 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 16:05:10 -0500
Subject: rpms/environment-modules Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602142105.k1EL5Ckd026522@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/environment-modules
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26510

Added Files:
	Makefile import.log 
Log Message:
Setup of module environment-modules


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Feb 14 21:05:17 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 16:05:17 -0500
Subject: rpms/environment-modules/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602142105.k1EL5JXi026544@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/environment-modules/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26510/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module environment-modules


--- NEW FILE .cvsignore ---


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

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Feb 14 21:06:46 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 16:06:46 -0500
Subject: rpms/environment-modules import.log,1.1,1.2
Message-ID: <200602142107.k1EL7ITv026629@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/environment-modules
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26587

Modified Files:
	import.log 
Log Message:
auto-import environment-modules-3.2.0p1-1 on branch devel from environment-modules-3.2.0p1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/environment-modules/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Feb 2006 21:05:10 -0000	1.1
+++ import.log	14 Feb 2006 21:06:46 -0000	1.2
@@ -0,0 +1 @@
+environment-modules-3_2_0p1-1:HEAD:environment-modules-3.2.0p1-1.src.rpm:1139951183



From fedora-extras-commits at redhat.com  Tue Feb 14 21:06:56 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 16:06:56 -0500
Subject: rpms/environment-modules/devel environment-modules.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602142107.k1EL7SJM026635@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/environment-modules/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26587/devel

Modified Files:
	.cvsignore sources 
Added Files:
	environment-modules.spec 
Log Message:
auto-import environment-modules-3.2.0p1-1 on branch devel from environment-modules-3.2.0p1-1.src.rpm


--- NEW FILE environment-modules.spec ---
Name:           environment-modules
Version:        3.2.0p1
Release:        1%{?dist}
Summary:        Provides dynamic modification of a user's environment

Group:          System Environment/Base
License:        GPL
URL:            http://modules.sourceforge.net/
Source0:        http://dl.sf.net/modules/modules-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tcl-devel, tclx-devel

%description
The Environment Modules package provides for the dynamic modification of
a user's environment via modulefiles.

Each modulefile contains the information needed to configure the shell
for an application. Once the Modules package is initialized, the
environment can be modified on a per-module basis using the module
command which interprets modulefiles. Typically modulefiles instruct
the module command to alter or set shell environment variables such as
PATH, MANPATH, etc. modulefiles may be shared by many users on a system
and users may have their own collection to supplement or replace the
shared modulefiles.

Modules can be loaded and unloaded dynamically and atomically, in an
clean fashion. All popular shells are supported, including bash, ksh,
zsh, sh, csh, tcsh, as well as some scripting languages such as perl.

Modules are useful in managing different versions of applications.
Modules can also be bundled into metamodules that will load an entire
suite of different applications.


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


%build
%configure --disable-versioning --prefix=%{_datadir} --exec-prefix=%{_datadir}/Modules
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.GPL README TODO
%{_sysconfdir}/profile.d/*
%{_bindir}/modulecmd
%{_datadir}/Modules/
%{_mandir}/man1/module.1.gz
%{_mandir}/man4/modulefile.4.gz


%changelog
* Thu Feb  9 2006 - Orion Poplawski  - 3.2.0p1-1
- Update to 3.2.0p1

* Fri Jan 27 2006 - Orion Poplawski  - 3.2.0-2
- Add profile.d links

* Tue Jan 24 2006 - Orion Poplawski  - 3.2.0-1
- Fedora Extras packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/environment-modules/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Feb 2006 21:05:17 -0000	1.1
+++ .cvsignore	14 Feb 2006 21:06:55 -0000	1.2
@@ -0,0 +1 @@
+modules-3.2.0p1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/environment-modules/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Feb 2006 21:05:17 -0000	1.1
+++ sources	14 Feb 2006 21:06:55 -0000	1.2
@@ -0,0 +1 @@
+e5167ea2b7c760920bebbedd7a0b25e5  modules-3.2.0p1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Feb 14 21:07:46 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 16:07:46 -0500
Subject: owners owners.list,1.637,1.638
Message-ID: <200602142108.k1EL8P9V026680@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	owners.list 
Log Message:
Added environment-modules



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -r1.637 -r1.638
--- owners.list	14 Feb 2006 14:02:39 -0000	1.637
+++ owners.list	14 Feb 2006 21:07:45 -0000	1.638
@@ -198,6 +198,7 @@
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|enigma|Clone of the ATARI game Oxyd|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|environment-modules|Provides dynamic modification of a user's environment|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|epiphany-extensions|Extensions for Epiphany, the GNOME web browser|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|epydoc|Edward Loper's Python API documentation generation tool|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|epylog|New logs analyzer and parser|icon at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Feb 14 21:18:26 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 16:18:26 -0500
Subject: rpms/wmx - New directory
Message-ID: <200602142118.k1ELIS0i026836@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Tue Feb 14 21:18:32 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 16:18:32 -0500
Subject: rpms/wmx/devel - New directory
Message-ID: <200602142118.k1ELIYtK026863@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Tue Feb 14 21:18:49 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 16:18:49 -0500
Subject: rpms/wmx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602142118.k1ELIpYt026905@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 14 21:18:55 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 16:18:55 -0500
Subject: rpms/wmx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200602142118.k1ELIvc8026923@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


--- NEW 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 Feb 14 21:18:31 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Feb 2006 16:18:31 -0500
Subject: rpms/xmms-modplug/devel xmms-modplug.spec,1.8,1.9
Message-ID: <200602142119.k1ELJ3wR026938@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-modplug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26840

Modified Files:
	xmms-modplug.spec 
Log Message:
* Tue Feb 14 2006 Ville Skytt??  - 2.05-5
- Rebuild, cosmetics.



Index: xmms-modplug.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-modplug/devel/xmms-modplug.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xmms-modplug.spec	26 Aug 2005 02:19:10 -0000	1.8
+++ xmms-modplug.spec	14 Feb 2006 21:18:31 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           xmms-modplug
 Version:        2.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Modplug Plugin for XMMS
 
 License:        Public Domain
@@ -11,7 +11,10 @@
 Source:         http://dl.sf.net/modplug-xmms/modplugxmms-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xmms-devel, gtk+-devel, gettext, libmodplug-devel >= 1:0.7
+BuildRequires:  xmms-devel
+BuildRequires:  gtk+-devel
+BuildRequires:  gettext
+BuildRequires:  libmodplug-devel >= 1:0.7
 BuildConflicts: %{name} < 2.0
 Requires:       xmms
 Provides:       modplug-xmms = %{version}-%{release}
@@ -35,7 +38,7 @@
 
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -52,14 +55,17 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{plugdir}/*
+%{plugdir}/libmodplugxmms.so
 
 %files -n modplugplay
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/modplugplay
 
 
 %changelog
+* Tue Feb 14 2006 Ville Skytt??  - 2.05-5
+- Rebuild, cosmetics.
+
 * Thu Aug 25 2005 Warren Togami  - 2.05-4
 - rebuild (#166814)
 



From fedora-extras-commits at redhat.com  Tue Feb 14 21:19:59 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 16:19:59 -0500
Subject: rpms/wmx import.log,1.1,1.2
Message-ID: <200602142120.k1ELKWEt027118@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	import.log 
Log Message:
auto-import wmx-6pl1-7 on branch devel from wmx-6pl1-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wmx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Feb 2006 21:18:49 -0000	1.1
+++ import.log	14 Feb 2006 21:19:59 -0000	1.2
@@ -0,0 +1 @@
+wmx-6pl1-7:HEAD:wmx-6pl1-7.src.rpm:1139951992



From fedora-extras-commits at redhat.com  Tue Feb 14 21:20:05 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 16:20:05 -0500
Subject: owners owners.list,1.638,1.639
Message-ID: <200602142120.k1ELKboA027134@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	owners.list 
Log Message:
wmx


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -r1.638 -r1.639
--- owners.list	14 Feb 2006 21:07:45 -0000	1.638
+++ owners.list	14 Feb 2006 21:20:04 -0000	1.639
@@ -1355,6 +1355,7 @@
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wmx|A really simple window manager for X|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|workrave|Recovery and prevention of RSI assistant|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Feb 14 21:20:05 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 16:20:05 -0500
Subject: rpms/wmx/devel Xclients.wmx.sh, NONE, 1.1 background.xpm, NONE,
	1.1 wmx-6pl1-cfg.patch, NONE, 1.1 wmx-6pl1-fix.patch, NONE,
	1.1 wmx.desktop, NONE, 1.1 wmx.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200602142120.k1ELKcYH027142@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Added Files:
	Xclients.wmx.sh background.xpm wmx-6pl1-cfg.patch 
	wmx-6pl1-fix.patch wmx.desktop wmx.spec 
Log Message:
auto-import wmx-6pl1-7 on branch devel from wmx-6pl1-7.src.rpm


--- NEW FILE Xclients.wmx.sh ---
#!/bin/bash
# wmx startup script

if [ -f ${HOME}/.wmx/startup ]; then
  # fire up user's startup apps:
  . ${HOME}/.wmx/startup
else
  # fire default startup apps:
  . /usr/share/wmx/startup
fi

exec wmx


--- NEW FILE background.xpm ---
/* XPM */
static char *background[] = {
/* width height num_colors chars_per_pixel */
"    80    80       27            1",
/* colors */
". c #5f96d6",
"# c #5990ca",
"a c #5991d6",
"b c #5f96ca",
"c c #5f97d6",
"d c #5992ca",
"e c #5993d6",
"f c #5f99e0",
"g c #5f99d6",
"h c #5f9be0",
"i c #5e9bd6",
"j c #5d9be8",
"k c #5c9be0",
"l c #60a2e0",
"m c #61a2e8",
"n c #69abe8",
"o c #70b5e8",
"p c #67abe8",
"q c #77bfe8",
"r c #6cb5e8",
"s c #91d8ef",
"t c #7fcbe8",
"u c #9de5ef",
"v c #81cbef",
"w c #8bd8e8",
"x c #a9f2ef",
"y c #8bd8ef",
/* pixels */
"gggggiiiihhiffiffghfgfhhhhhhhhhkkkllmmppnpppprrrrrppppppnppnmmmllkkkkkkhhhhgffff",
"fhffiiieihhhhhfihhhhhehhfhhhhhhhkkkkklmlmlnppnrrorrnppnpppppnnnmmllkjjkkkhhhhhhh",
"hhhhhhhhhhhhhhhhhihhhihhhfhhihhhkhkkkkmlmlplpnnorrnpporrorppnnpnlplmmljjkkkkhhhh",
"kkkkkkkkkkkhhkkkkhhhhhhihhfhhhhhhkhhkkkkjmmlplpnnppnoroooooporrpppppplllljjkkkkk",
"kkkkkkkkkkkkkkkkhhkhhhhfeiffffhhihhhhkkkjkkmmmppppnnnooorrorrroonpnnpmmmljmjkkkk",
"klkkkkkkkkkkkkkkhhhhhihhiieiifhhheeiihhhhkkkklmmlpnnonoooororrorrrrronnplmmmmjmk",
"mjlmllkjkjkkkkjjjhhkhhhhhihfeeeefgeeeffihhhhhkjmllpponpooooroqqoooooorppnpnplmml",
"mmlmlllmmllklkkkkhhhhhhieihigeieggeeegiegehhhhhkkllllplnoooooqqqorqooooronnnnnpl",
"plpppplmlmlllkkkjjkkhhhieehgggeeceeeeceggeghhihhhkjkllnrpooroqqqqrooqrrrpponplpp",
"plpnlpplmllmlkjjkjkhhhieeefegecccbbbbdddeeegehefhhhkklllpnnrorqrqrqqqqqooonplrop",
"pponlnppmlllllllkkkkkhhihfieggcdebbbbbd..ddbeegfehhhkkmmmnnnnrorqrqqrqrooorrooro",
"ppnnpplplpmmlmllmmkkkkhhfiiegceedddab.dddadbddeeegeihhkkmmponoorqorroqqoqoorrrrp",
"oonooonpnpppllmmlkkkkkkhhheggcceeddd#a######.bdeeeegehhjmmmlnnporqqoqqorqqrrrrrr",
"rrrrrrprppnnnmpmlklkkkkhfhiieeeee..add########ddddegeihhkjmlppnrrorqoqooqqrrrorr",
"ooooooooooppnnpnmmmmjjkkhhiegeeeeaaad###########abbcgefhhklmplprroqqqqqqqqrorqro",
"oqqooooooonronnnmplmmlkkkhhfhfecc..d.d##########b.a.cehfhhkjmmnpproooqqqqqqqqqqq",
"qrrrrooooooonnnnppmmlmlkjkhhhhfgcccc.bd##########aadecgehhkkklmpnpooooooqqoooorr",
"rqooqorqqqorrorpppnnnmmllkkhhifffgcbc.bdb##########d.ccgfhhkjjlpppooroooqqqqqqqo",
"qoovovvrqvoqroorrrpppmnlmmjkkhhhiegeeeda#d########adaeeegihhkmlmpprroorqoqqooooo",
"qrrqvvvqovovqqqoorronppmpmljkkkhhheggcedddab#######addeegeihhjjmpnnooorqqorooooq",
"qqqvqqoqqqqqoovvqoroponnnpmmjjjkhhhhfeceedddd###bb#db.eccehhhkjmmmnnroooororooqo",
"qqqqqvvqqvooqvvvvvqqorrrppnnlmmjjhhhigggceead#b#b#babddccgiehhkkmnpppproorqqqqqq",
"qqqvqvvvqqqvvqqqqqovoqrooopppmmmjkkhhhffccedddbdb#.abb.ccgeihkjjmmlpprrororrqroq",
"qqoqqqqqqvqqqqvqqqqqvvvqoorrppppmlkkkhhiiggcbeeddaddd.cccgghihkjjlmmnnprrrqorqqq",
"qqqvqvvtqqtqttvqqqvqqqqoqqorooppmmlkkhhhhgggcccbadddddeeeeeeihkkkmllnnnooooqoroo",
"qqqqvvvqtvqqttvtqvttqvvqqqrqorooppplmkkkhhhgeeecdeeeaacccgffehhkkkmplppoooorqorq",
"qoqvqqqqqttqttvtvvttttvqqqvvqqooppnmmlkkkkhfgheeeeeeeeeecgffehhkkkmmpppprorooror",
"ooqqqqqqttvvttttvvvvtvvvttvvqqqooropmpmmkkkhhhffggcceeeeeeeifihhkklmpnpnnoorqrqo",
"qqovqqvqttvqtttttttttvvvvvvvqvqoooorrnpmmjjkhhfhffgeeeeeeeegehhhkklmmppproroorqo",
"rqqqqqqttqttvvttttttttttttttttvqqororopmplmjkhhhfheffgggeffhhhhhhkjmmpnprorroqoq",
"orovqqvqqtqvtvvssyvsvstttwttttttqqvroopnnpmlkkkkhhhihgfgfiiefhhhhkjmmpnpprroroqr",
"roqqqqqqqqqvtvtttttvyywwwwstvvvvvvqqqqoropmpmmjjkkhheeeehhhfhihkhkjmmlppprpooooo",
"qqqqqqqqtvvtvtttttwvvswwwvtyyvvtttttqqvqooonpmmjjkhhhhhihhhhihhhhkmmmnnppppooooq",
"rorooqqqqtvtvttttttvvvwwvwywssywwttvtqvvvroopnlmmmkkkhhhhhihhhkkkkjjmmlppprrooro",
"qqqqqqqqqtqqvtvvvsvvtstvwswyywywwwvtvvtvvvqronnmmmjjjkkkhhhhkhhkhklmmlmpnppprooq",
"rorrqqqqqqtqttttttttvtvtytswyyywwywstwtvtvqooonnnnmllmjjkhkkkkkkjmmmmlnnnppnoooo",
"qqqoroqoqqqqvqvvvvsswvwvwywssssssyswwwtsvvtqqqropppnmmlllkkkkkkjjjmmmlmnnpprrroq",
"orqqqrqqqqqqtttvvvvvttvtswssywwwusywswwwsvtvqqoqorrnnplmmmmmlllmmmmmmnlnpprrroro",
"oorqqorqqqqqqqvtttttttwtwvyyswysssuyyssssyvsvqqovoooopppnmmlmmmmmmmpnlpnooorrooo",
"orqqrqvoooqqqqtvvvtvvvvvstsvywwwyswywywuyysysvvtvooqooonnnmplmlmmlmlplnnrrooooro",
"qqqqorrooqqqqqqqvvtvvvsvvsytvwsssyuuuuuuysyysvstvqqqqororppnpnpnnnnnpnnoooooooqq",
"orrqrooqooqqorqqvqqtvvtttttwtvysywywwwwyyyuwsssysvvtvqvvooooonppppnpprppprrrooro",
"qqqrorooooqrrqqqqqvqqvqqtqttttvvyywywywwwuyyuwssssysvtvvvqqooooorrprorrrrroorrqq",
"orqoroqooqqqoqooooqvqqvqqqqvvvsvvvywssuuyyuyuuyywysyywvvtvqqqoqooorroorroooroooo",
"qqrqqqqrroooqoqorqrrovqqvqqqvttttvvtwssusuywuyyywussssvsvvtqqvvqrqqqqrrqoqqqqooq",
"qqoorrrooooooorooooqrrrrvovqqqqqvvvvvtwwysuywyxuyyuywwsyvvtvvvtqqqrqrvqorqoqqovq",
"qrroooooroorrrrorooorrooooooqqovqqvvvtvswwwyuuuuxuxyyyywsywwttttttqqqtqovvqvqqqq",
"rqvvvqroorroooorrppnprppnororroqvoqqvttvwwsssuuuyyuyuywyuuusyssvwvtttqqqqqqrqqvq",
"qqqorrooroorrroornnpnnnnppnnprroorqvvqqtvvsywysuuxuuyyyuxxuuuswswvwvvvvvqtqvqqqq",
"qqqvoqroorrooppopnnpppppnpppppnpnpoorovqvqttwwsyuuuxuyxxyxxxuuywwsyvwtwttttvvqqq",
"qqooororroorppnppnnmnlmlmnmmnnnppppprorqooqqqtsyssuuyuxxxxxxyxxuuusyytsvvttvvqqq",
"qqqrorqrrrrooonnppnlmlmlmlmlmlmmmmmmnnpporovqqvsvywwwyuxyxxxuyxxxuuuswysvvtvttvt",
"qqroqrorooorpnnnnnppmmmlmlkkkkkkkjlmmnpnnporoqqvvvswwuwuuyyuyxxwuwyyuuswwwttttvq",
"qqqqqrqorrrororrpnmllmlmkkkkkjkjkkjjmklmnppproqvvqvvvsuyuyuxxxuxxuyuuuswywttttqq",
"tqqqqrooororrooonppmlmlklkkkhhhhhkkkkkjmlmmpnnoroqvvvvssywwuxyyxwyuxuuuwwyvyvttv",
"tqqovroroooorpoprppmlmlljjkkjkkhhhhkhhkkkkknmppporovvtttywwyuuyywuwyywuwswyyvttv",
"qqqqqoqorroooororrnnnmmmmkkkkkkhhhhhhkhhkkkmmnmnnrorvqvtttywyywyyywuuuuywysttttv",
"vqqqqqqooqoorqqorrrnpppnmllmkjkhkhkhhhhhkkkkkjlmnpnpooqqqtttywwyyuuuuussywvvvvvv",
"vqqqqrqqqqrqqqvqqoooonnppnpmmmjkkkkkhhhhkhhhjklmmnpporoovqqvvttssywyssyswwttvvvq",
"qvqqqoqvvrqqqvvqqqvvqrorrnnpllmlmkkjjhhkhhhhkkkmmmnmnnnorvqvqttvvtvwtwtywtttvvtq",
"vqqqqqqqqqqqqqqqqqqqqorooorppnpmmmlkkkkkjjjkkkjjjlmmnpprroqqqqtvvttttvvtttttvtqv",
"qqqqqqvvvqqqtqvvttvqtqqqqrqoronnnplmmmmlkkjjjkjjjmlmlppppprqoqqqqqtttvvtttvvtttq",
"qqqqrqqovvqqvqttttttttttqqqvqqoroonnppmmmmmjjjjjjmmmmmpmpprroovqqqvqvvtttqqvtqqq",
"qqvoqqqoorqqqqtttttttwttvttvqqoqoooonppppnmmmlmmmmmmmmpppppppoorrroooqqqqqqqqqqq",
"qorroorrrrqrqqvvtttvtttvttvvvvqvqooropprppppmlmmmmmmmplmnpnpnpopprrorrroorqooqro",
"rrrrrrnnoroorqrqvvqtttvttvttvvtqvvqqoorrpnnlplmpnpmpmmlmppppnllpoopproorrrroroor",
"prpnnnpppnnpnprooroqovqqvvqqqvqvqqrqroponrplmpnmmmlllmmmpmmpplpplmppnrlpprnonnnp",
"pmlmlmpmlmmnlppppnoooooooqqvqqqqrqrrqroonlppllnnlmnlmmnmnmmnllmmlpmmpmpppnnpplpp",
"mmmlmlllkkkkkkjjjmlmppnppooorqoroorrornonnppppnmpmmmmmmmmmmmmllllmmmmmmllmnlmmlm",
"kkkkkkkkkkhhhhhkkkkkjlmmpppnnnnrroorrrrrolplpmnmmmlllmjlkmljmllkkkljjklkkllllkkk",
"kkkhkhhiiiiihhhhhhhkkjkjjmllpppnpppnnonnnnpnpmmmlkljjjjjlkkmkkkkkjjkkkkkkjkkkkjk",
"hhhhiiiiiiiigggegieeihhhkkkkmmmllpnnplolpnlnnmlklkklkkkkkkkkkkkkkhhhkkkkhhkhhhhh",
"hhhhiefgeeeeceeeeeeeeefhhhkkkjjlmmmmplllnmnmllkkkklkkkkkkkhkkkhkhhhkhhhhhhiihhhf",
"gieieegggdeecdeceeeeeeeeeihhhkkkkkmmmmmmmmmmljmjlkkkkhhhkkhhkkkhhhhhhhfffhfhhiih",
"geggeeeeedceebcccbcgeegeiehhhkkkjjmllmmmmmmmmmjjllkkjkkhkhkhhkhhhhihhieiiheieeif",
"igeeeeeeccceddbbbcbcceeefehhhhkkkjkklmmlmlmmmmmmjlllkkkkkkhhkhhhhhhhhfheeifgfege",
"gggegggggbcccbcccccccegfihhihkhkklllmlmlmlmlmpmmlmmmjkkkkkkhkhhhhhhefhihifggegeg",
"eggeggggggeeeeeeedecgeegehhhhhkkkklllmmnmlnlmnmpmlmmlkllkjjkkkkkkhhheeeieehfeege",
"ggeeggggggeeeeegggggeeefehhhhhhkklkllmpmpnnnppppnlmplmmmmmkllkkkhhhhhhhfhihfegee",
"ggifffhhiiiiggeegegfheeeeifihhkkkkklnmmppppppnnppnnnmpnplmlmmmmjkkkkhhihhhhiffif"
};

wmx-6pl1-cfg.patch:

--- NEW FILE wmx-6pl1-cfg.patch ---
diff -NarU5 wmx-6pl1.orig/Config.h wmx-6pl1/Config.h
--- wmx-6pl1.orig/Config.h	2001-04-23 11:48:31.000000000 -0400
+++ wmx-6pl1/Config.h	2005-12-16 09:08:35.000000000 -0500
@@ -73,12 +73,12 @@
 // Spawn a temporary new shell between the wm and each new process?
 #define CONFIG_EXEC_USING_SHELL   False
 
 // What to run to get a new window (from the "New" menu option)
 #define CONFIG_NEW_WINDOW_LABEL "New"
-//#define CONFIG_NEW_WINDOW_COMMAND "xterm"
-#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
+#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+//#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
 #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
 // or, for example,
 //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
 // alternatively,
 #define CONFIG_DISABLE_NEW_WINDOW_COMMAND (dConfig.disableNew())
@@ -89,11 +89,11 @@
  
 // Directory under $HOME in which to look for commands for the
 // middle-button menu
 #define CONFIG_COMMAND_MENU       ".wmx"
 // only used if COMMAND_MENU is not found; ignored if invalid directory:
-#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/local/lib/wmx/menu"
+#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/share/wmx"
 // append screennumber to COMMAND_MENU directory;
 // use non screen style as fallback
 #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
  
 // Focus possibilities.
@@ -120,11 +120,11 @@
 
 // Number of pixels off the screen you have to push a window
 // before the manager notices the window is off-screen (the higher
 // the value, the easier it is to place windows at the screen edges)
 
-#define CONFIG_BUMP_DISTANCE      16
+#define CONFIG_BUMP_DISTANCE      32
 
 // If CONFIG_PROD_SHAPE is True, all frame element shapes will be
 // recalculated afresh every time their focus changes.  This will
 // probably slow things down hideously, but has been reported as
 // necessary on some systems (possibly SunOS 4.x with OpenWindows).
@@ -294,11 +294,11 @@
 #define CONFIG_MENU_BORDERS       "black"
 
 // Pixel width for the bit of frame to the left of the window and the
 // sum of the two bits at the top
 
-#define CONFIG_FRAME_THICKNESS    8
+#define CONFIG_FRAME_THICKNESS    6
 
 
 // ========================
 // Section IV. Flashy stuff
 // ========================
@@ -307,11 +307,11 @@
 // in ./background.xpm; if USE_PIXMAP_MENUS is also True, the menus
 // will be too.  The latter screws up in palette-based visuals, but
 // should be okay in true-colour.
 
 #define CONFIG_USE_PIXMAPS        True
-#define CONFIG_USE_PIXMAP_MENUS   True
+#define CONFIG_USE_PIXMAP_MENUS   False
 
 // Set CHANNEL_SURF for multi-channel switching; CHANNEL_CLICK_SIZE is
 // how close you have to middle-button-click to the top-right corner
 // of the root window before the channel change happens.  Set
 // USE_CHANNEL_KEYS if you want Alt-F1, Alt-F2 etc for quick channel
diff -NarU5 wmx-6pl1.orig/Makefile.in wmx-6pl1/Makefile.in
--- wmx-6pl1.orig/Makefile.in	1999-08-31 19:53:08.000000000 -0400
+++ wmx-6pl1/Makefile.in	2005-12-16 09:07:16.000000000 -0500
@@ -39,13 +39,14 @@
 distclean: clean
 	rm -f wmx wmx.old *~ *.bak *.org *.orig config.* Makefile
 
 install:
 	-mv -f @bindir@/wmx @bindir@/wmx.old
+	strip wmx
 	cp wmx @bindir@/wmx
 	-chmod 0755 @bindir@/wmx
-	-chown root:wheel @bindir@/wmx
+	-chown root:root @bindir@/wmx
 	-rm -f @bindir@/wmx.old
 
 # DO NOT DELETE -- make depend depends on it
 Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \
  Manager.h listmacro.h background.xpm

wmx-6pl1-fix.patch:

--- NEW FILE wmx-6pl1-fix.patch ---
diff -NarU5 wmx-6pl1.orig/Buttons.C.rej wmx-6pl1/Buttons.C.rej
--- wmx-6pl1.orig/Buttons.C.rej	2001-04-24 04:58:31.000000000 -0400
+++ wmx-6pl1/Buttons.C.rej	1969-12-31 19:00:00.000000000 -0500
@@ -1,75 +0,0 @@
-***************
-*** 173,179 ****
-              m_altStateRetained = False;
-          }
-  
-! #ifdef CONFIG_WANT_SUNKEYS
-  #ifdef CONFIG_QUICKRAISE_KEY
-  	if (key == CONFIG_QUICKRAISE_KEY && c) {
-  
---- 173,179 ----
-              m_altStateRetained = False;
-          }
-  
-! #if CONFIG_WANT_SUNKEYS
-  #ifdef CONFIG_QUICKRAISE_KEY
-  	if (key == CONFIG_QUICKRAISE_KEY && c) {
-  
-***************
-*** 184,202 ****
-  	    }
-  	    
-  	} else
-! #endif CONFIG_QUICKRAISE_KEY
-  #ifdef CONFIG_QUICKHIDE_KEY
-  	if (key == CONFIG_QUICKHIDE_KEY && c) {
-  	    c->hide();
-  	      
-  	} else 
-! #endif CONFIG_QUICKHIDE_KEY
-  #ifdef CONFIG_QUICKCLOSE_KEY
-  	if (key == CONFIG_QUICKCLOSE_KEY && c) {
-  	    c->kill();
-  
-  	} else
-! #endif CONFIG_QUICKCLOSE_KEY
-  #ifdef CONFIG_QUICKHEIGHT_KEY
-  	if (key == CONFIG_QUICKHEIGHT_KEY && c) {
-  
---- 184,202 ----
-  	    }
-  	    
-  	} else
-! #endif // CONFIG_QUICKRAISE_KEY
-  #ifdef CONFIG_QUICKHIDE_KEY
-  	if (key == CONFIG_QUICKHIDE_KEY && c) {
-  	    c->hide();
-  	      
-  	} else 
-! #endif // CONFIG_QUICKHIDE_KEY
-  #ifdef CONFIG_QUICKCLOSE_KEY
-  	if (key == CONFIG_QUICKCLOSE_KEY && c) {
-  	    c->kill();
-  
-  	} else
-! #endif // CONFIG_QUICKCLOSE_KEY
-  #ifdef CONFIG_QUICKHEIGHT_KEY
-  	if (key == CONFIG_QUICKHEIGHT_KEY && c) {
-  
-***************
-*** 207,213 ****
-  	    }
-  
-  	} else
-! #endif //CONFIG_QUICKHEIGHT_KEY
-  #if CONFIG_WANT_SUNPOWERKEY
-  	  if (key == SunXK_PowerSwitch) {
-             pid_t pid = fork();
---- 207,213 ----
-  	    }
-  
-  	} else
-! #endif // CONFIG_QUICKHEIGHT_KEY
-  #if CONFIG_WANT_SUNPOWERKEY
-  	  if (key == SunXK_PowerSwitch) {
-             pid_t pid = fork();
diff -NarU5 wmx-6pl1.orig/Channel.C.orig wmx-6pl1/Channel.C.orig
--- wmx-6pl1.orig/Channel.C.orig	2000-05-24 11:46:14.000000000 -0400
+++ wmx-6pl1/Channel.C.orig	1969-12-31 19:00:00.000000000 -0500
@@ -1,220 +0,0 @@
-
-#include "Manager.h"
-#include "Client.h"
-#include 
-
-static char *numerals[10][7] = {
-    { " ### ", "#   #", "#  ##", "# # #", "##  #", "#   #", " ### " },
-    { "  #  ", " ##  ", "  #  ", "  #  ", "  #  ", "  #  ", " ### " },
-    { " ### ", "#   #", "    #", "  ## ", " #   ", "#    ", "#####" },
-    { "#####", "   # ", "  #  ", " ### ", "    #", "    #", "#### " },
-    { "   # ", "  ## ", " # # ", "#  # ", "#####", "   # ", "   # " },
-    { "#####", "#    ", "#### ", "    #", "    #", "    #", "#### " },
-    { "  ## ", " #   ", "#    ", "#### ", "#   #", "#   #", " ### " },
-    { "#####", "    #", "   # ", "  #  ", " #   ", " #   ", " #   " },
-    { " ### ", "#   #", "#   #", " ### ", "#   #", "#   #", " ### " },
-    { " ### ", "#   #", "#   #", " ####", "    #", "   # ", " ##  " }
-};
-
-
-void WindowManager::flipChannel(Boolean statusOnly, Boolean flipDown,
-				Boolean quickFlip, Client *push)
-{
-    int x, y, i, sc;
-    if (!CONFIG_CHANNEL_SURF) return;
-
-    for(sc = 0; sc < screensTotal(); sc++)
-    {
-	if (!m_channelWindow[sc]) {
-
-	XColor nearest, ideal;
-
-	    if (!XAllocNamedColor(display(), DefaultColormap(display(), sc),
-			      CONFIG_CHANNEL_NUMBER, &nearest, &ideal)) {
-	    
-		if (!XAllocNamedColor(display(), DefaultColormap(display(), sc),
-				  "black", &nearest, &ideal)) {
-		
-		fatal("Couldn't allocate green or black");
-	    }
-	}
-
-	XSetWindowAttributes wa;
-	wa.background_pixel = nearest.pixel;
-	wa.override_redirect = True;
-	
-	    m_channelWindow[sc] = XCreateWindow
-	      (display(), mroot(sc), 0, 0, 1, 1, 0, CopyFromParent, CopyFromParent,
-	     CopyFromParent, CWOverrideRedirect | CWBackPixel, &wa);
-    }
-    }
-
-
-    int nextChannel;
-
-    if (statusOnly) nextChannel = m_currentChannel;
-    else {
-	if (!flipDown) {
-	    nextChannel = m_currentChannel + 1;
-	    if (nextChannel > m_channels) nextChannel = 1;
-	} else {
-	    nextChannel = m_currentChannel - 1;
-	    if (nextChannel < 1) nextChannel = m_channels;
-	}
-    }
-
-    XRectangle r;
-    Boolean first = True;
-    char number[7];
-    sprintf(number, "%d", nextChannel);
-
-    for (i = 0; i < strlen(number); ++i) {
-	for (y = 0; y < 7; ++y) {
-	    for (x = 0; x < 5; ++x) {
-		if (numerals[number[i]-'0'][y][x] != ' ') {
-/*		    
-		    r.x = i * 110 + x * 20; r.y = y * 20;
-		    r.width = r.height = 20;
- */      
-                    r.x = 10 + (i * 6 + x) * CONFIG_CHANNEL_NUMBER_SIZE;
-                    r.y = y * CONFIG_CHANNEL_NUMBER_SIZE;
-                    r.width = r.height = CONFIG_CHANNEL_NUMBER_SIZE;
-                    for(sc = 0; sc < screensTotal(); sc++)
-                    {
-		    XShapeCombineRectangles
-                          (display(), m_channelWindow[sc], ShapeBounding,
-                           0, 0, &r, 1, first ? ShapeSet : ShapeUnion,
-                           YXBanded);
-                    }
-		    first = False;
-		}
-	    }
-	}
-    }
-
-    for(sc = 0; sc < screensTotal(); sc++)
-    {
-/*
-        XMoveResizeWindow(display(), m_channelWindow[sc],
-			  DisplayWidth(display(), sc) - 30 -
-		      110 * strlen(number), 30, 500, 160);
- */
-
-        XMoveResizeWindow(display(), m_channelWindow[sc],
-                          DisplayWidth(display(), sc) - 30 -
-                          (5 * CONFIG_CHANNEL_NUMBER_SIZE + 10) *
-                          strlen(number), 30, 500, 160);
-	XMapRaised(display(), m_channelWindow[sc]);
-    }
-
-    if (!statusOnly) {
-
-	ClientList considering;
-
-	for (i = m_orderedClients.count()-1; i >= 0; --i) {
-	    considering.append(m_orderedClients.item(i));
-	}
-
-	for (i = 0; i < considering.count(); ++i) {
-	    if (considering.item(i) == push || considering.item(i)->isSticky()
-#ifdef CONFIG_USE_WINDOW_GROUPS
-		|| (push &&
-		    push->hasWindow(considering.item(i)->groupParent()))
-#endif
-		) {
-		considering.item(i)->setChannel(nextChannel);
-	    } else {
-		considering.item(i)->flipChannel(True, nextChannel);
-	    }
-	}
-
-	considering.remove_all();
-    }
-
-    m_currentChannel = nextChannel;
-    m_channelChangeTime = timestamp(True) +
-	(quickFlip ? CONFIG_QUICK_FLIP_DELAY : CONFIG_FLIP_DELAY);
-
-#if CONFIG_GNOME_COMPLIANCE != False
-    gnomeUpdateChannelList();
-#endif
-}
-
-
-void WindowManager::instateChannel()
-{
-    int i;
-    m_channelChangeTime = 0;
-    for(i = 0; i < screensTotal(); i++)
-    {
-	XUnmapWindow(display(), m_channelWindow[i]);
-    }
-
-    ClientList considering;
-
-    for (i = m_orderedClients.count()-1; i >= 0; --i) {
-	considering.append(m_orderedClients.item(i));
-    }
-
-    for (i = 0; i < considering.count(); ++i) {
-	considering.item(i)->flipChannel(False, m_currentChannel);
-	if (considering.item(i)->channel() == m_channels &&
-	    !considering.item(i)->isSticky()) createNewChannel();
-    }
-
-    if (m_activeClient && m_activeClient->channel() != channel()) {
-	m_activeClient = 0;
-    }
-
-    checkChannel(m_channels-1);
-}    
-
-
-void WindowManager::checkChannel(int ch)
-{
-    if (m_channels <= 2 || ch < m_channels - 1) return;
-
-    for (int i = m_orderedClients.count()-1; i >= 0; --i) {
-	if (m_orderedClients.item(i)->channel() == ch) return;
-    }
-
-    --m_channels;
-
-#if CONFIG_GNOME_COMPLIANCE != False
-    gnomeUpdateChannelList();
-#endif
-
-    if (m_currentChannel > m_channels) m_currentChannel = m_channels;
-
-    checkChannel(ch - 1);
-}
-
-
-void WindowManager::createNewChannel()
-{
-    ++m_channels;
-#if CONFIG_GNOME_COMPLIANCE != False
-    gnomeUpdateChannelList();
-#endif
-
-}
-
-void WindowManager::gotoChannel(int channel, Client *push)
-{
-    if (channel == m_currentChannel) {
-	flipChannel(True, False, False, 0);
-	return;
-   }
-
-    if (channel > 0 && channel <= m_channels) {
-
-	while (m_currentChannel != channel) {
-	    if (m_channels < channel) {
-		flipChannel(False, False, True, push);
-	    } else {
-		flipChannel(False, True, True, push);
-	    }
-	    XSync(display(), False);
-	}
-    }
-}
diff -NarU5 wmx-6pl1.orig/Menu.C wmx-6pl1/Menu.C
--- wmx-6pl1.orig/Menu.C	2001-10-05 09:01:21.000000000 -0400
+++ wmx-6pl1/Menu.C	2005-12-14 16:29:42.000000000 -0500
@@ -619,11 +619,11 @@
     if (Client *c = checkFeedback(item)) c->raiseFeedbackLevel();
 }
 
 
 CommandMenu::CommandMenu(WindowManager *manager, XEvent *e,
-			 char* otherdir = NULL)
+			 char* otherdir)
     : Menu(manager, e)
 {
     const char *home = getenv("HOME");
     const char *wmxdir = getenv("WMXDIR");
 


--- NEW FILE wmx.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=wmx
Comment=Start wmx
Exec=wmx
Type=Application

[Window Manager]
SessionManaged=true


--- NEW FILE wmx.spec ---
Name: wmx
Version: 6pl1
Release: 7%{?dist}
Summary: A really simple window manager for X
License: BSD
Group: User Interface/X
URL: http://www.all-day-breakfast.com/wmx/
Source0: http://www.all-day-breakfast.com/wmx/%{name}-%{version}.tar.gz
Source1: wmx-defaults.tar.gz
Source2: background.xpm
Source3: wmx.desktop
Source4: Xclients.wmx.sh
Patch0: wmx-6pl1-fix.patch
Patch1: wmx-6pl1-cfg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xorg-x11-devel

%description
A really simple window manager for X, based on wm2, with a minimal set of
configurable options.

%prep
%setup -q
%setup -a 1
%{__install} -p %{SOURCE2} .
%patch0 -p1
%patch1 -p1

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__install} -s -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
%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/wmx.desktop
%{__install} -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xinit/Xclients.d/Xclients.wmx.sh

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc README* UPDATES ANNOYING-BUGS
%{_bindir}/*
%{_datadir}/*
%{_sysconfdir}/X11/xinit/Xclients.d/*

%changelog
* Sat Dec 31 2005 Gabriel Somlo  6pl1-7
- added BuildRequires for X

* Thu Dec 29 2005 Gabriel Somlo  6pl1-6
- more spec file fixes as per I. Vazquez
- default startup script tweaks

* Mon Dec 19 2005 Gabriel Somlo  6pl1-5
- removed example .xsession file
- added /etc/X11/xinit/Xclients.d/Xclients.wmx.sh startup script
- fixed up some of the default menu entries

* Mon Dec 19 2005 Gabriel Somlo  6pl1-4
- spec file fixes as per J. Carlson
- desktop file for xdm login screen

* Fri Dec 16 2005 Gabriel Somlo  6pl1-3
- spec file fixes as per P. Lemenkov and I. Vazquez
- default menu entries now go in /usr/share/wmx/menu
- example wmx .xsession file added to %doc
- gave up on using /usr/X11R6/bin -- using %{_bindir} instead 

* Wed Dec 14 2005 Gabriel Somlo  6pl1-2
- increased bump-distance parameter for easier placement at edge of screen
- 'fix' patch now cleans up dead files from source directory

* Wed Sep 07 2005 Gabriel Somlo  6pl1-1
- upgrade to 6pl1
- added better looking window-tab background.xpm
- fixed license (bsd, not gpl)

* Tue Aug 09 2005 Gabriel Somlo  6pl1-0
- rebuilt for Fedora Core 4

* Wed May 23 2004 Gabriel Somlo 
- initial spec and packages.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wmx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Feb 2006 21:18:55 -0000	1.1
+++ .cvsignore	14 Feb 2006 21:20:05 -0000	1.2
@@ -0,0 +1,2 @@
+wmx-6pl1.tar.gz
+wmx-defaults.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wmx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Feb 2006 21:18:55 -0000	1.1
+++ sources	14 Feb 2006 21:20:05 -0000	1.2
@@ -0,0 +1,2 @@
+212297d70acef90bbc9dac254de39cb8  wmx-6pl1.tar.gz
+2cf73db613197fcc27304f71e188eb19  wmx-defaults.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 21:20:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Feb 2006 16:20:35 -0500
Subject: rpms/libgda/devel libgda-1.9.100-sharp.patch,1.2,1.3
Message-ID: <200602142121.k1ELL8RM027181@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	libgda-1.9.100-sharp.patch 
Log Message:
Readd custom Libraries pkgconfig settings to libgda-sharp because libgnomedb-sharp needs this during build and so may others

libgda-1.9.100-sharp.patch:

Index: libgda-1.9.100-sharp.patch
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda-1.9.100-sharp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgda-1.9.100-sharp.patch	14 Feb 2006 19:25:15 -0000	1.2
+++ libgda-1.9.100-sharp.patch	14 Feb 2006 21:20:35 -0000	1.3
@@ -7,12 +7,12 @@
  
 --- libgda-1.9.100/gda-sharp/gda-sharp-2.0.pc.in~	2006-02-13 21:43:19.000000000 +0100
 +++ libgda-1.9.100/gda-sharp/gda-sharp-2.0.pc.in	2006-02-13 21:59:35.000000000 +0100
-@@ -1,12 +1,12 @@
+@@ -1,12 +1,14 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
--libdir=@libdir@
+ libdir=@libdir@
 -pkglibdir=${libdir}/libgda
-+libdir=${exec_prefix}/lib
++pkglibdir=${prefix}/lib/mono/gda-sharp-2.0
 +gapidir=${prefix}/share/gapi-2.0
 +
  
@@ -21,7 +21,7 @@
  Requires: gtk-sharp-2.0
  Version: @VERSION@
 -Cflags: -I:${pkglibdir}/gda-api.xml
--Libraries=${pkglibdir}/gda-sharp.dll ${pkglibdir}/gda-sharp.dll.config
--Libs: -r:gda-sharp.dll
 +Cflags: -I:${gapidir}/gda-api.xml
-+Libs: -r:${libdir}/mono/gda-sharp-2.0/gda-sharp.dll
+ Libraries=${pkglibdir}/gda-sharp.dll ${pkglibdir}/gda-sharp.dll.config
+-Libs: -r:gda-sharp.dll
++Libs: -r:${pkglibdir}/gda-sharp.dll



From fedora-extras-commits at redhat.com  Tue Feb 14 21:29:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Feb 2006 16:29:02 -0500
Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-sharp.patch, 1.1,
	1.2 libgnomedb.spec, 1.11, 1.12
Message-ID: <200602142129.k1ELTYPv027308@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	libgnomedb-1.9.100-sharp.patch libgnomedb.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  1:1.9.100-5
- Bump release and rebuild for new gcc4.1 and glibc
- Attempt to properly install C-sharp/mono bindings
- Add %{?dist} for consistency with my other packages
- Remove static lib from -devel package
- Handle gconf2 files as described on the wiki scriptlets page


libgnomedb-1.9.100-sharp.patch:

Index: libgnomedb-1.9.100-sharp.patch
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb-1.9.100-sharp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgnomedb-1.9.100-sharp.patch	16 Jan 2006 22:42:29 -0000	1.1
+++ libgnomedb-1.9.100-sharp.patch	14 Feb 2006 21:29:02 -0000	1.2
@@ -32,3 +32,23 @@
 -  
 +  
  
+--- libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp-2.0.pc.in~	2006-02-14 20:57:23.000000000 +0100
++++ libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp-2.0.pc.in	2006-02-14 20:57:23.000000000 +0100
+@@ -1,12 +1,14 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-pkglibdir=${libdir}/libgnomedb
++pkglibdir=${prefix}/lib/mono/gnomedb-sharp-2.0
++gapidir=${prefix}/share/gapi-2.0
++
+ 
+ Name: gnomedb-sharp-2.0
+ Description: GnomeDB# - GNOMEDB .NET Binding
+ Requires: gda-sharp-2.0 gnome-sharp-2.0
+ Version: @VERSION@
+-Cflags: -I:${pkglibdir}/gnomedb-api.xml
++Cflags: -I:${gapidir}/gnomedb-api.xml
+ Libraries=${pkglibdir}/gnomedb-sharp.dll ${pkglibdir}/gnomedb-sharp.dll.config
+-Libs: -r:gnomedb-sharp.dll
++Libs: -r:${pkglibdir}/gnomedb-sharp.dll


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgnomedb.spec	17 Jan 2006 08:37:17 -0000	1.11
+++ libgnomedb.spec	14 Feb 2006 21:29:02 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.9.100
-Release:         4
+Release:         5%{?dist}
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
@@ -31,6 +31,9 @@
 Requires:        libgda-devel >= 1:1.9.99
 Requires:        gtk2-devel >= 1.3.6
 Requires:        libglade2-devel
+Requires(pre):   GConf2
+Requires(post):  GConf2 /sbin/ldconfig
+Requires(preun): GConf2
 
 %description devel
 This package contains the header files and libraries needed to write
@@ -67,25 +70,40 @@
   --vendor fedora --add-category X-Fedora --delete-original \
   %{buildroot}%{_datadir}/applications/database-properties.desktop
 
-# install gnomedb-api.xml
-install -m 644 gnomedb-sharp/gnomedb-api.xml \
-   %{buildroot}%{_libdir}/libgnomedb/gnomedb-api.xml
+#fixup mono / sharp related files install
+mkdir -p %{buildroot}/%{_datadir}/gapi-2.0
+install -m 644 gnomedb-sharp/gnomedb-api.xml %{buildroot}/%{_datadir}/gapi-2.0
+mkdir -p %{buildroot}/usr/lib/mono/gnomedb-sharp-2.0
+mv %{buildroot}/%{_libdir}/libgnomedb/gnomedb-sharp.dll* \
+  %{buildroot}/usr/lib/mono/gnomedb-sharp-2.0
 
 # remove unpackaged files
-rm -f %{buildroot}/%{_libdir}/*.la
-rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.a
-rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.la
-rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.a
-rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.la
+rm -f %{buildroot}/%{_libdir}/*.{a,la}
+rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.{a,la}
+rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.{a,la}
+
+
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/libgnomedb.schemas >/dev/null || :
+fi
 
 
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
 
-for SCHEMA in %{_sysconfdir}/gconf/schemas/libgnomedb.schemas; do
-/usr/bin/gconftool-2 --makefile-install-rule $SCHEMA > /dev/null 2>&1
-done
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
+fi
 
 
 %postun -p /sbin/ldconfig
@@ -121,7 +139,6 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/libgnomedb-1.9
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libgnomedb-2.0.pc
 %{_datadir}/omf
@@ -130,12 +147,19 @@
 
 %files sharp
 %defattr(-,root,root)
-%{_libdir}/libgnomedb/gnomedb-api.xml
-%{_libdir}/libgnomedb/gnomedb-sharp.dll*
+%{_datadir}/gapi-2.0
+/usr/lib/mono/gnomedb-sharp-2.0
 %{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
 
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede  1:1.9.100-5
+- Bump release and rebuild for new gcc4.1 and glibc
+- Attempt to properly install C-sharp/mono bindings
+- Add %%{?dist} for consistency with my other packages
+- Remove static lib from -devel package
+- Handle gconf2 files as described on the wiki scriptlets page
+
 * Tue Jan 17 2006 Hans de Goede  1:1.9.100-4
 - Put mono files only in sharp package and not in sharp and main package.
 - Make -sharp package Require the main package.



From fedora-extras-commits at redhat.com  Tue Feb 14 21:30:26 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:30:26 -0500
Subject: rpms/qucs import.log,1.10,1.11
Message-ID: <200602142131.k1ELV1ZF027413@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qucs/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	13 Feb 2006 21:55:47 -0000	1.10
+++ import.log	14 Feb 2006 21:30:24 -0000	1.11
@@ -7,3 +7,4 @@
 qucs-0_0_7-8:FC-3:qucs-0.0.7-8.src.rpm:1131143675
 qucs-0_0_7-8:FC-4:qucs-0.0.7-8.src.rpm:1131143762
 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



From fedora-extras-commits at redhat.com  Tue Feb 14 21:30:33 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:30:33 -0500
Subject: rpms/qucs/FC-4 .cvsignore, 1.2, 1.3 qucs.spec, 1.3, 1.4 sources, 1.2,
	1.3 qucs-0.0.7-2.diff, 1.1, NONE qucs-0.0.7-config.diff, 1.1, NONE
Message-ID: <200602142131.k1ELV5oP027418@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	.cvsignore qucs.spec sources 
Removed Files:
	qucs-0.0.7-2.diff qucs-0.0.7-config.diff 
Log Message:
auto-import qucs-0.0.8-1 on branch FC-4 from qucs-0.0.8-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 10:26:36 -0000	1.2
+++ .cvsignore	14 Feb 2006 21:30:32 -0000	1.3
@@ -1 +1 @@
-qucs-0.0.7.tar.gz
+qucs-0.0.8.tar.gz


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-4/qucs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qucs.spec	4 Nov 2005 22:36:17 -0000	1.3
+++ qucs.spec	14 Feb 2006 21:30:32 -0000	1.4
@@ -1,18 +1,17 @@
 Summary:	Circuit simulator
 Name: 		qucs
-Version:	0.0.7
-Release: 	8%{?dist}
+Version:	0.0.8
+Release: 	1%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
-Patch0:		qucs-0.0.7-config.diff
-Patch1:		qucs-0.0.7-2.diff
+#Patch0:		qucs-gcc4.1.diff
 URL:		http://qucs.sourceforge.net/
 License:	GPL 
 Group: 		Applications/Engineering
 BuildRoot:    	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel
-
+Requires: freehdl
 
 
 %description
@@ -22,11 +21,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+%if "%{?fedora}" > "4"
+CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection"
+%endif
 %configure
 make %{?_smp_mflags}
 
@@ -54,6 +55,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* 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
+ 
 * Fri Nov 4 2005 Eric Tanguy  - 0.0.7-8
 - Modify ctaegories in qucs.desktop
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 10:26:36 -0000	1.2
+++ sources	14 Feb 2006 21:30:32 -0000	1.3
@@ -1 +1 @@
-87059c90cdb6e55b30c55ca72ad792b7  qucs-0.0.7.tar.gz
+0b280090e4b7ff390c6cc4458b3387a8  qucs-0.0.8.tar.gz


--- qucs-0.0.7-2.diff DELETED ---


--- qucs-0.0.7-config.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb 14 21:32:31 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:32:31 -0500
Subject: rpms/qucs import.log,1.11,1.12
Message-ID: <200602142133.k1ELX4P0027533@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import qucs-0.0.8-1 on branch FC-3 from qucs-0.0.8-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/qucs/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	14 Feb 2006 21:30:24 -0000	1.11
+++ import.log	14 Feb 2006 21:32:31 -0000	1.12
@@ -8,3 +8,4 @@
 qucs-0_0_7-8:FC-4:qucs-0.0.7-8.src.rpm:1131143762
 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



From fedora-extras-commits at redhat.com  Tue Feb 14 21:32:38 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:32:38 -0500
Subject: rpms/qucs/FC-3 .cvsignore, 1.2, 1.3 qucs.spec, 1.3, 1.4 sources, 1.2,
	1.3 qucs-0.0.7-2.diff, 1.1, NONE qucs-0.0.7-config.diff, 1.1, NONE
Message-ID: <200602142133.k1ELXBXr027540@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	.cvsignore qucs.spec sources 
Removed Files:
	qucs-0.0.7-2.diff qucs-0.0.7-config.diff 
Log Message:
auto-import qucs-0.0.8-1 on branch FC-3 from qucs-0.0.8-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2005 10:26:36 -0000	1.2
+++ .cvsignore	14 Feb 2006 21:32:38 -0000	1.3
@@ -1 +1 @@
-qucs-0.0.7.tar.gz
+qucs-0.0.8.tar.gz


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-3/qucs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qucs.spec	4 Nov 2005 22:34:49 -0000	1.3
+++ qucs.spec	14 Feb 2006 21:32:38 -0000	1.4
@@ -1,18 +1,17 @@
 Summary:	Circuit simulator
 Name: 		qucs
-Version:	0.0.7
-Release: 	8%{?dist}
+Version:	0.0.8
+Release: 	1%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
-Patch0:		qucs-0.0.7-config.diff
-Patch1:		qucs-0.0.7-2.diff
+#Patch0:		qucs-gcc4.1.diff
 URL:		http://qucs.sourceforge.net/
 License:	GPL 
 Group: 		Applications/Engineering
 BuildRoot:    	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel
-
+Requires: freehdl
 
 
 %description
@@ -22,11 +21,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+%if "%{?fedora}" > "4"
+CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection"
+%endif
 %configure
 make %{?_smp_mflags}
 
@@ -54,6 +55,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* 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
+ 
 * Fri Nov 4 2005 Eric Tanguy  - 0.0.7-8
 - Modify ctaegories in qucs.desktop
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2005 10:26:36 -0000	1.2
+++ sources	14 Feb 2006 21:32:38 -0000	1.3
@@ -1 +1 @@
-87059c90cdb6e55b30c55ca72ad792b7  qucs-0.0.7.tar.gz
+0b280090e4b7ff390c6cc4458b3387a8  qucs-0.0.8.tar.gz


--- qucs-0.0.7-2.diff DELETED ---


--- qucs-0.0.7-config.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb 14 21:44:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 14 Feb 2006 16:44:31 -0500
Subject: rpms/lyx/devel lyx.spec,1.22,1.23
Message-ID: <200602142145.k1ELj3LP027739@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	lyx.spec 
Log Message:
avoid --without-included-boost on fc4/gcc-4.0.2



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lyx.spec	14 Feb 2006 20:50:11 -0000	1.22
+++ lyx.spec	14 Feb 2006 21:44:30 -0000	1.23
@@ -1,4 +1,9 @@
 
+## avoid on fc4/gcc-4.0.2, due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24389
+%if "%{?fedora}" != "4"
+%define _without_included_boost --without-included-boost
+%endif
+
 %define beta pre5
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
@@ -41,7 +46,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
-BuildRequires: boost-devel
+%{?_without_included_boost:BuildRequires: boost-devel}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -119,8 +124,8 @@
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-aspell \
-  --without-included-boost \
-  --without-warnings --disable-debug --disable-dependency-tracking
+  --without-warnings --disable-debug --disable-dependency-tracking \
+  %{?_without_included_boost}
 
 # Intermediate cleanup
 # (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking



From fedora-extras-commits at redhat.com  Tue Feb 14 21:45:59 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:45:59 -0500
Subject: rpms/drgeo import.log,1.9,1.10
Message-ID: <200602142146.k1ELkVYm027817@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import drgeo-1.1.0-7 on branch devel from drgeo-1.1.0-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/drgeo/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	10 Feb 2006 19:48:31 -0000	1.9
+++ import.log	14 Feb 2006 21:45:59 -0000	1.10
@@ -6,3 +6,4 @@
 drgeo-1_1_0-4:FC-3:drgeo-1.1.0-4.src.rpm:1131041937
 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



From fedora-extras-commits at redhat.com  Tue Feb 14 21:46:05 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:46:05 -0500
Subject: rpms/drgeo/devel drgeo.spec,1.5,1.6
Message-ID: <200602142146.k1ELkbk0027820@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	drgeo.spec 
Log Message:
auto-import drgeo-1.1.0-7 on branch devel from drgeo-1.1.0-7.src.rpm


Index: drgeo.spec
===================================================================
RCS file: /cvs/extras/rpms/drgeo/devel/drgeo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- drgeo.spec	10 Feb 2006 19:48:37 -0000	1.5
+++ drgeo.spec	14 Feb 2006 21:46:05 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Interactive educational geometry software
 Name: drgeo
 Version: 1.1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.ofset.org/drgeo
@@ -61,6 +61,9 @@
 %{_datadir}/applications/fedora-drgeo.desktop
 
 %changelog
+* Tue Feb 14 2006 Eric Tanguy  - 1.1.0-7
+- Rebuild for FC5
+
 * Fri Feb 10 2006 Eric Tanguy  - 1.1.0-6
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Feb 14 21:48:16 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:48:16 -0500
Subject: rpms/drgeo-doc import.log,1.3,1.4
Message-ID: <200602142148.k1ELmm9q027958@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/drgeo-doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27912

Modified Files:
	import.log 
Log Message:
auto-import drgeo-doc-1.6-7 on branch devel from drgeo-doc-1.6-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/drgeo-doc/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Feb 2006 21:38:40 -0000	1.3
+++ import.log	14 Feb 2006 21:48:16 -0000	1.4
@@ -1,2 +1,3 @@
 drgeo-doc-1_6-5:HEAD:drgeo-doc-1.6-5.src.rpm:1130967155
 drgeo-doc-1_6-6:HEAD:drgeo-doc-1.6-6.src.rpm:1139607510
+drgeo-doc-1_6-7:HEAD:drgeo-doc-1.6-7.src.rpm:1139953686



From fedora-extras-commits at redhat.com  Tue Feb 14 21:48:22 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:48:22 -0500
Subject: rpms/drgeo-doc/devel drgeo-doc.spec,1.2,1.3
Message-ID: <200602142148.k1ELmsms027962@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/drgeo-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27912/devel

Modified Files:
	drgeo-doc.spec 
Log Message:
auto-import drgeo-doc-1.6-7 on branch devel from drgeo-doc-1.6-7.src.rpm


Index: drgeo-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/drgeo-doc/devel/drgeo-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drgeo-doc.spec	10 Feb 2006 21:38:47 -0000	1.2
+++ drgeo-doc.spec	14 Feb 2006 21:48:22 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Html documentation for drgeo
 Name: drgeo-doc
 Version: 1.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.ofset.org/drgeo
@@ -38,6 +38,9 @@
 %{_datadir}/drgeo/help
 
 %changelog
+* Tue Feb 14 2006 Eric Tanguy  - 1.6-7
+- Rebuild for FC5
+
 * Fri Feb 10 2006 Eric Tanguy  - 1.6-6
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Feb 14 21:49:38 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:49:38 -0500
Subject: rpms/gperiodic import.log,1.3,1.4
Message-ID: <200602142150.k1ELoBou028094@cvs-int.fedora.redhat.com>

Author: tanguy

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Feb 2006 21:40:09 -0000	1.3
+++ import.log	14 Feb 2006 21:49:38 -0000	1.4
@@ -1,2 +1,3 @@
 gperiodic-2_0_8-2:HEAD:gperiodic-2.0.8-2.src.rpm:1130708935
 gperiodic-2_0_8-3:HEAD:gperiodic-2.0.8-3.src.rpm:1139607599
+gperiodic-2_0_8-4:HEAD:gperiodic-2.0.8-4.src.rpm:1139953768



From fedora-extras-commits at redhat.com  Tue Feb 14 21:49:45 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:49:45 -0500
Subject: rpms/gperiodic/devel gperiodic.spec,1.2,1.3
Message-ID: <200602142150.k1ELoHR9028101@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	gperiodic.spec 
Log Message:
auto-import gperiodic-2.0.8-4 on branch devel from gperiodic-2.0.8-4.src.rpm


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gperiodic.spec	10 Feb 2006 21:40:15 -0000	1.2
+++ gperiodic.spec	14 Feb 2006 21:49:45 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://koti.welho.com/jfrantz/software/gperiodic.html
@@ -58,6 +58,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Tue Feb 14 2006 Eric Tanguy  - 2.0.8-4
+- Rebuild for FC5
+
 * Fri Feb 10 2006 Eric Tanguy  - 2.0.8-3
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Feb 14 21:50:20 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 16:50:20 -0500
Subject: rpms/python-numarray/devel .cvsignore, 1.3, 1.4 python-numarray.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200602142150.k1ELoqmG028153@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore python-numarray.spec sources 
Log Message:
Update to 1.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Dec 2005 23:57:31 -0000	1.3
+++ .cvsignore	14 Feb 2006 21:50:20 -0000	1.4
@@ -1 +1 @@
-numarray-1.5.0.tar.gz
+numarray-1.5.1.tar.gz


Index: python-numarray.spec
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/devel/python-numarray.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-numarray.spec	22 Dec 2005 23:57:31 -0000	1.3
+++ python-numarray.spec	14 Feb 2006 21:50:20 -0000	1.4
@@ -3,7 +3,7 @@
 %{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
 
 Name:           python-numarray
-Version:        1.5.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Python array manipulation and computational library
 
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 - Orion Poplawski  - 1.5.1-1
+- Update to 1.5.1
+
 * Thu Dec 22 2005 - Orion Poplawski  - 1.5.0-1
 - Update to 1.5.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2005 23:57:31 -0000	1.3
+++ sources	14 Feb 2006 21:50:20 -0000	1.4
@@ -1 +1 @@
-6db331e321a74fa896cd5961fe33b7ef  numarray-1.5.0.tar.gz
+e6c282b950f4383f294134424ae58f3b  numarray-1.5.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 21:51:33 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:51:33 -0500
Subject: rpms/ircd-hybrid import.log,1.19,1.20
Message-ID: <200602142152.k1ELq5Vv028269@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28233

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-6 on branch devel from ircd-hybrid-7.2.0-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	10 Feb 2006 21:41:36 -0000	1.19
+++ import.log	14 Feb 2006 21:51:33 -0000	1.20
@@ -16,3 +16,4 @@
 ircd-hybrid-7_2_0-4:FC-4:ircd-hybrid-7.2.0-4.src.rpm:1134400497
 ircd-hybrid-7_2_0-4:FC-3:ircd-hybrid-7.2.0-4.src.rpm:1134400580
 ircd-hybrid-7_2_0-5:HEAD:ircd-hybrid-7.2.0-5.src.rpm:1139607686
+ircd-hybrid-7_2_0-6:HEAD:ircd-hybrid-7.2.0-6.src.rpm:1139953882



From fedora-extras-commits at redhat.com  Tue Feb 14 21:51:39 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:51:39 -0500
Subject: rpms/ircd-hybrid/devel ircd-hybrid.spec,1.8,1.9
Message-ID: <200602142152.k1ELqB3L028272@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28233/devel

Modified Files:
	ircd-hybrid.spec 
Log Message:
auto-import ircd-hybrid-7.2.0-6 on branch devel from ircd-hybrid-7.2.0-6.src.rpm


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ircd-hybrid.spec	10 Feb 2006 21:41:42 -0000	1.8
+++ ircd-hybrid.spec	14 Feb 2006 21:51:39 -0000	1.9
@@ -10,7 +10,7 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Eric Tanguy  - 7.2.0-6
+- Rebuild for FC5
+
 * Fri Feb 10 2006 Eric Tanguy  - 7.2.0-5
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Feb 14 21:52:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Feb 2006 16:52:24 -0500
Subject: rpms/xemacs-sumo/devel xemacs-sumo-20051208-trax.patch, NONE,
	1.1 xemacs-sumo.spec, 1.15, 1.16
Message-ID: <200602142152.k1ELquqM028334@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28307

Modified Files:
	xemacs-sumo.spec 
Added Files:
	xemacs-sumo-20051208-trax.patch 
Log Message:
* Sun Feb 12 2006 Ville Skytt?? 
- Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process.


xemacs-sumo-20051208-trax.patch:

--- NEW FILE xemacs-sumo-20051208-trax.patch ---
--- xemacs-packages/lisp/xslt-process/xslt-process.el~	2001-05-01 08:41:45.000000000 +0300
+++ xemacs-packages/lisp/xslt-process/xslt-process.el	2006-02-12 23:57:32.000000000 +0200
@@ -49,3 +49,3 @@
 
-(defcustom xslt-process-default-processor (list 'Saxon)
+(defcustom xslt-process-default-processor (list 'TrAX)
   "*The default XSLT processor to be applied to an XML document."


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xemacs-sumo.spec	12 Feb 2006 15:16:39 -0000	1.15
+++ xemacs-sumo.spec	14 Feb 2006 21:52:24 -0000	1.16
@@ -24,6 +24,7 @@
 Patch0:         %{name}-20051208-hypb-posix.patch
 Patch1:         %{name}-20051208-pydoc-path.patch
 Patch2:         %{name}-20051208-latin-unity-kludge.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
@@ -40,6 +41,7 @@
 BuildRequires:  /sbin/install-info
 BuildRequires:  %{__python}
 BuildRequires:  %{__perl}
+BuildRequires:  java-devel
 Requires:       xemacs-common
 # Fake release in this provision in order to avoid self-obsoletion (for now).
 Provides:       apel-xemacs = 10.6-6
@@ -95,6 +97,8 @@
 mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
 # support write-region's kludge in latin-unity
 %patch2 -p0
+# use TrAX by default in xslt-process
+%patch3 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -131,6 +135,8 @@
 rm -rf tli_rbl src
 cd -
 
+rm xemacs-packages/etc/xslt-process/java/{xslt.jar,xslt/*.class}
+
 
 %build
 export xemacs_batch="xemacs-nox -batch -vanilla"
@@ -149,6 +155,10 @@
 $xemacs_batch -f batch-byte-recompile-directory \
   xemacs-packages/lisp mule-packages/lisp
 
+cd xemacs-packages/etc/xslt-process/java
+javac xslt/TrAX.java && jar cvf xslt.jar xslt/*.class && rm xslt/*.class
+cd -
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -227,6 +237,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Ville Skytt?? 
+- Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process.
+
 * Sat Feb 11 2006 Ville Skytt?? 
 - Bundle upstream gnus package version 1.89 to fix #181011.
 - Get rid of tli_rbl binary only applet jar in jde's docs (first step



From fedora-extras-commits at redhat.com  Tue Feb 14 21:53:22 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:53:22 -0500
Subject: rpms/libupnp import.log,1.3,1.4
Message-ID: <200602142153.k1ELrs8s028438@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import libupnp-1.2.1a-6 on branch devel from libupnp-1.2.1a-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libupnp/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Feb 2006 21:43:02 -0000	1.3
+++ import.log	14 Feb 2006 21:53:22 -0000	1.4
@@ -1,2 +1,3 @@
 libupnp-1_2_1a-4:HEAD:libupnp-1.2.1a-4.src.rpm:1137746395
 libupnp-1_2_1a-5:HEAD:libupnp-1.2.1a-5.src.rpm:1139607771
+libupnp-1_2_1a-6:HEAD:libupnp-1.2.1a-6.src.rpm:1139953991



From fedora-extras-commits at redhat.com  Tue Feb 14 21:53:28 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:53:28 -0500
Subject: rpms/libupnp/devel libupnp.spec,1.2,1.3
Message-ID: <200602142154.k1ELs0hG028448@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	libupnp.spec 
Log Message:
auto-import libupnp-1.2.1a-6 on branch devel from libupnp-1.2.1a-6.src.rpm


Index: libupnp.spec
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/libupnp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libupnp.spec	10 Feb 2006 21:43:08 -0000	1.2
+++ libupnp.spec	14 Feb 2006 21:53:28 -0000	1.3
@@ -1,7 +1,7 @@
 Version: 1.2.1a
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Libraries
 URL: http://upnp.sourceforge.net/
@@ -83,6 +83,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Feb 14 2006 Eric Tanguy  - 1.2.1a-6
+- Rebuild for FC5
+
 * Fri Feb 10 2006 Eric Tanguy  - 1.2.1a-5
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Feb 14 21:53:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Feb 2006 16:53:54 -0500
Subject: rpms/openvpn/devel .cvsignore, 1.7, 1.8 openvpn.spec, 1.13,
	1.14 sources, 1.7, 1.8 openvpn-2.1_beta7.tar.gz.asc, 1.1, NONE
Message-ID: <200602142154.k1ELsQwb028482@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore openvpn.spec sources 
Removed Files:
	openvpn-2.1_beta7.tar.gz.asc 
Log Message:
Update to 2.1_beta8.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Nov 2005 23:33:28 -0000	1.7
+++ .cvsignore	14 Feb 2006 21:53:54 -0000	1.8
@@ -1 +1,2 @@
-openvpn-2.1_beta7.tar.gz
+openvpn-2.1_beta8.tar.gz
+openvpn-2.1_beta8.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openvpn.spec	5 Jan 2006 00:54:49 -0000	1.13
+++ openvpn.spec	14 Feb 2006 21:53:54 -0000	1.14
@@ -1,14 +1,14 @@
-%define prerelease beta7
+%define prerelease beta8
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.5%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.6%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
-#Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
-Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
+Source0:           http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
+#Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
 Source1:           http://openvpn.net/signatures/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz.asc
 # Sample 2.0 config files
 Source2:           roadwarrior-server.conf
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Tue Feb 14 2006 Steven Pritchard  2.1-0.6.beta8
+- Update to 2.1_beta8
+
 * Wed Jan 04 2006 Steven Pritchard  2.1-0.5.beta7
 - Man page shouldn't be executable (BZ#176953)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Nov 2005 23:33:28 -0000	1.7
+++ sources	14 Feb 2006 21:53:54 -0000	1.8
@@ -1 +1,2 @@
-fe7d2b8ae5645fc9332c3763b350dc06  openvpn-2.1_beta7.tar.gz
+4e749071060048fc21b2d6f5bf4da617  openvpn-2.1_beta8.tar.gz
+62aa2e86a197e28e1707159f95e3858b  openvpn-2.1_beta8.tar.gz.asc


--- openvpn-2.1_beta7.tar.gz.asc DELETED ---



From fedora-extras-commits at redhat.com  Tue Feb 14 21:55:15 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:55:15 -0500
Subject: rpms/ushare import.log,1.3,1.4
Message-ID: <200602142155.k1ELtl06028583@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	import.log 
Log Message:
auto-import ushare-0.9.5-6 on branch devel from ushare-0.9.5-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ushare/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Feb 2006 21:44:28 -0000	1.3
+++ import.log	14 Feb 2006 21:55:15 -0000	1.4
@@ -1,2 +1,3 @@
 ushare-0_9_5-4:HEAD:ushare-0.9.5-4.src.rpm:1138295015
 ushare-0_9_5-5:HEAD:ushare-0.9.5-5.src.rpm:1139607858
+ushare-0_9_5-6:HEAD:ushare-0.9.5-6.src.rpm:1139954105



From fedora-extras-commits at redhat.com  Tue Feb 14 21:55:21 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Tue, 14 Feb 2006 16:55:21 -0500
Subject: rpms/ushare/devel ushare.spec,1.2,1.3
Message-ID: <200602142155.k1ELtrXt028591@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	ushare.spec 
Log Message:
auto-import ushare-0.9.5-6 on branch devel from ushare-0.9.5-6.src.rpm


Index: ushare.spec
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ushare.spec	10 Feb 2006 21:44:34 -0000	1.2
+++ ushare.spec	14 Feb 2006 21:55:21 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: UPnP (TM) A/V Media Server
 Name: ushare
 Version: 0.9.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://ushare.geexbox.org/
@@ -70,6 +70,9 @@
 %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/
 
 %changelog
+* Tue Feb 14 2006 Eric Tanguy  - 0.9.5-6
+- Rebuild for FC5
+
 * Fri Feb 10 2006 Eric Tanguy  - 0.9.5-5
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Feb 14 22:01:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Feb 2006 17:01:55 -0500
Subject: rpms/scorched3d/FC-4 scorched3d-syslibs.patch, 1.1,
	1.2 scorched3d.spec, 1.5, 1.6
Message-ID: <200602142202.k1EM2ROp030706@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	scorched3d-syslibs.patch scorched3d.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede  - 39.1-4
- Bump release and rebuild for new gcc4.1 and glibc.

* Sun Feb 12 2006  - 39.1-3
- fix server crashing with certain landscape types (patch 13)

* Sat Feb 11 2006  - 39.1-2
- upgrade to CVS snapshot of 20050929, as Debian does, but not to
  the newer apoc version as this causes problems playing online (patch 0)
- fix gcc41 compilation (patch 3)
- fix 64 bit compilation (bz 158646) (patch 4)
- fix compile with openal-0.9 (patch 5)
- use htmlview for helpfile viewing instead of hardcoded mozilla,
  run this in background so the game doesn't freeze (patch 6)
- fix all the security issues reported on the fulldisclosure mailinglist:
  http://seclists.org/lists/fulldisclosure/2005/Nov/0079.html
  (bz 161694) (patch 7, 8, 9, 10)
- fix 2 additonal security issues found while fixing the above (patch 11, 12)
- this release also fixes bz 161694

* Sat Oct  8 2005 Ville Skytt??  - 39.1-1
- 39.1.
- Avoid aclocal >= 1.8 warnings.
- Install icon into icons/hicolor.
- Clean up build dependencies.


scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-4/scorched3d-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-syslibs.patch	8 Nov 2004 05:20:12 -0000	1.1
+++ scorched3d-syslibs.patch	14 Feb 2006 22:01:54 -0000	1.2
@@ -1,31 +1,28 @@
-diff -Nru scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
---- scorched.orig/src/coms/NetServerProtocol.cpp	2003-12-06 19:45:22.000000000 +0200
-+++ scorched/src/coms/NetServerProtocol.cpp	2004-08-16 01:15:42.278969732 +0300
-@@ -22,7 +22,7 @@
- #include 
- #include 
- #include 
+--- scorched/src/engine/ModFileEntry.cpp~	2005-06-06 00:54:01.000000000 +0300
++++ scorched/src/engine/ModFileEntry.cpp	2005-10-08 02:14:29.000000000 +0300
+@@ -20,7 +20,7 @@
+ 
+ #include 
+ #include 
 -#include 
 +#include 
+ #include 
+ #include 
  
- NetServerProtocol::NetServerProtocol()
- {
-diff -Nru scorched.orig/src/landscape/LandscapeMaps.cpp scorched/src/landscape/LandscapeMaps.cpp
---- scorched.orig/src/landscape/LandscapeMaps.cpp	2004-02-27 00:00:26.000000000 +0200
-+++ scorched/src/landscape/LandscapeMaps.cpp	2004-08-16 01:16:04.026241398 +0300
-@@ -25,7 +25,7 @@
+--- scorched/src/landscape/LandscapeMaps.cpp~	2005-08-10 15:39:31.000000000 +0300
++++ scorched/src/landscape/LandscapeMaps.cpp	2005-10-08 02:14:45.000000000 +0300
+@@ -31,7 +31,7 @@
  #include 
  #include 
  #include 
 -#include 
 +#include 
+ #include 
  #include 
  
- LandscapeMaps::LandscapeMaps() : 
-diff -Nru scorched.orig/src/scorched/Makefile.am scorched/src/scorched/Makefile.am
---- scorched.orig/src/scorched/Makefile.am	2004-05-20 19:41:53.000000000 +0300
-+++ scorched/src/scorched/Makefile.am	2004-08-16 01:14:56.963984303 +0300
-@@ -608,39 +608,6 @@
+--- scorched/src/scorched/Makefile.am~	2005-08-30 21:04:22.000000000 +0300
++++ scorched/src/scorched/Makefile.am	2005-10-08 02:15:02.000000000 +0300
+@@ -690,39 +690,6 @@
  	../XML/XMLParser.h \
  	../XML/XMLStringBuffer.cpp \
  	../XML/XMLStringBuffer.h \
@@ -64,10 +61,42 @@
 -	../zlib/zutil.h \
  	../actions/ActionVector.cpp \
  	../actions/ActionVector.h \
- 	../actions/CameraPositionAction.cpp \
-diff -Nru scorched.orig/src/XML/XMLParser.h scorched/src/XML/XMLParser.h
---- scorched.orig/src/XML/XMLParser.h	2004-05-14 00:50:20.000000000 +0300
-+++ scorched/src/XML/XMLParser.h	2004-08-16 01:15:18.494326511 +0300
+ 	../actions/Animation.cpp \
+--- scorched/src/coms/NetServerProtocol.cpp~	2005-06-13 20:31:06.000000000 +0300
++++ scorched/src/coms/NetServerProtocol.cpp	2005-10-08 02:14:04.000000000 +0300
+@@ -22,7 +22,7 @@
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
+ 
+ NetServerProtocol::NetServerProtocol()
+ {
+--- scorched/src/coms/ComsMessageSender.cpp~	2005-07-20 00:45:36.000000000 +0300
++++ scorched/src/coms/ComsMessageSender.cpp	2005-10-08 02:13:38.000000000 +0300
+@@ -27,7 +27,7 @@
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
+ #include 
+ 
+ bool ComsMessageSender::sendToServer(ComsMessage &message)
+--- scorched/src/tank/TankAvatar.cpp~	2005-03-22 19:45:49.000000000 +0200
++++ scorched/src/tank/TankAvatar.cpp	2005-10-08 02:15:15.000000000 +0300
+@@ -22,7 +22,7 @@
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
+ #include 
+ 
+ GLTexture *TankAvatar::defaultTexture_ = 0;
+--- scorched/src/XML/XMLParser.h~	2005-06-11 19:53:41.000000000 +0300
++++ scorched/src/XML/XMLParser.h	2005-10-08 02:15:26.000000000 +0300
 @@ -23,7 +23,7 @@
  
  #include 


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-4/scorched3d.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scorched3d.spec	22 May 2005 22:50:37 -0000	1.5
+++ scorched3d.spec	14 Feb 2006 22:01:54 -0000	1.6
@@ -1,22 +1,39 @@
 Name:           scorched3d
-Version:        37.2
-Release: 3
-
+Version:        39.1
+Release:        4%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.scorched3d.co.uk/
-# http://dl.sf.net/scorched3d/Scorched3D-37.2-src.tar.gz bzip2'd to save 3.5MB
-Source0:        Scorched3D-37.2-src.tar.bz2
+Source0:        http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Source2:        http://dl.sf.net/scorched3d/Scorched3D-37.2-datafix.zip
-Patch0:         %{name}-syslibs.patch
+Patch0:         %{name}-cvs-20050929.patch
+Patch1:         %{name}-syslibs.patch
+Patch2:         %{name}-aclocal18.patch
+Patch3:         %{name}-gcc41.patch
+Patch4:         %{name}-64bit.patch
+Patch5:         %{name}-openal.patch
+Patch6:         %{name}-help.patch
+Patch7:         %{name}-sprintf.patch
+Patch8:         %{name}-formatstring.patch
+Patch9:         %{name}-strxxx.patch
+Patch10:        %{name}-negint.patch
+Patch11:        %{name}-XML-injection.patch
+Patch12:        %{name}-HTML-injection.patch
+Patch13:        %{name}-opengl-without-context.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel, wxGTK2-devel, SDL_mixer-devel, SDL_net-devel
-BuildRequires:  ImageMagick, %{_libdir}/libGLU.so.1, desktop-file-utils
-BuildRequires:  expat-devel, autoconf, automake
+BuildRequires:  wxGTK2-devel
+BuildRequires:  openal-devel
+BuildRequires:  freealut-devel
+BuildRequires:  SDL_net-devel
+BuildRequires:  ImageMagick
+BuildRequires:  libGLU-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  expat-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -37,13 +54,24 @@
 
 %prep
 %setup -q -n scorched
-%{__unzip} -qqoa -d data %{SOURCE2}
-# Use system zlib and expat
+find . -type d -name CVS | xargs rm -r
+rm -r autom4te.cache `find . -name Makefile`
+rm -r src/zlib `find src/XML ! -name "X*"`
 %patch0 -p1
-rm -rf src/zlib `find src/XML ! -name "X*"`
-# Get a clean start
-rm -rf autom4te.cache `find . -name Makefile`
-grep -v configure autogen.sh | sh -x -
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+. autogen.sh
 
 
 %build
@@ -58,35 +86,70 @@
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 make install DESTDIR=$RPM_BUILD_ROOT
+
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode 644 \
   --add-category X-Fedora \
   %{SOURCE1}
-install -Dpm 644 tank2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/scorched3d.png
-# The default doc dir gets removed later in the %%doc scriptlet...
-cp -pR $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version} __docs
+install -Dpm 644 tank2.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png
+
+mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO __docs/documentation/
+%doc AUTHORS COPYING TODO __docs/*
 %{_bindir}/scorched3d
 %{_datadir}/games/scorched3d/
 %{_datadir}/applications/*scorched3d.desktop
-%{_datadir}/pixmaps/scorched3d.png
+%{_datadir}/icons/hicolor/*/apps/scorched3d.png
 
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede  - 39.1-4
+- Bump release and rebuild for new gcc4.1 and glibc.
+
+* Sun Feb 12 2006  - 39.1-3
+- fix server crashing with certain landscape types (patch 13)
+
+* Sat Feb 11 2006  - 39.1-2
+- upgrade to CVS snapshot of 20050929, as Debian does, but not to
+  the newer apoc version as this causes problems playing online (patch 0)
+- fix gcc41 compilation (patch 3)
+- fix 64 bit compilation (bz 158646) (patch 4)
+- fix compile with openal-0.9 (patch 5)
+- use htmlview for helpfile viewing instead of hardcoded mozilla,
+  run this in background so the game doesn't freeze (patch 6)
+- fix all the security issues reported on the fulldisclosure mailinglist:
+  http://seclists.org/lists/fulldisclosure/2005/Nov/0079.html
+  (bz 161694) (patch 7, 8, 9, 10)
+- fix 2 additonal security issues found while fixing the above (patch 11, 12)
+- this release also fixes bz 161694
+
+* Sat Oct  8 2005 Ville Skytt??  - 39.1-1
+- 39.1.
+- Avoid aclocal >= 1.8 warnings.
+- Install icon into icons/hicolor.
+- Clean up build dependencies.
+
 * Sun May 22 2005 Jeremy Katz  - 37.2-3
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Apr  7 2005 Michael Schwendt  - 37.2-2
 - rebuilt
 
 * Mon Aug 16 2004 Ville Skytt??  - 0:37.2-0.fdr.1



From fedora-extras-commits at redhat.com  Tue Feb 14 22:02:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Feb 2006 17:02:55 -0500
Subject: rpms/scorched3d/FC-4 scorched3d-64bit.patch, NONE,
	1.1 scorched3d-HTML-injection.patch, NONE,
	1.1 scorched3d-XML-injection.patch, NONE,
	1.1 scorched3d-aclocal18.patch, NONE,
	1.1 scorched3d-cvs-20050929.patch, NONE,
	1.1 scorched3d-formatstring.patch, NONE,
	1.1 scorched3d-gcc41.patch, NONE, 1.1 scorched3d-help.patch,
	NONE, 1.1 scorched3d-negint.patch, NONE,
	1.1 scorched3d-openal.patch, NONE,
	1.1 scorched3d-opengl-without-context.patch, NONE,
	1.1 scorched3d-pgsql.patch, NONE, 1.1 scorched3d-sprintf.patch,
	NONE, 1.1 scorched3d-strxxx.patch, NONE, 1.1
Message-ID: <200602142202.k1EM2vYb030763@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Added Files:
	scorched3d-64bit.patch scorched3d-HTML-injection.patch 
	scorched3d-XML-injection.patch scorched3d-aclocal18.patch 
	scorched3d-cvs-20050929.patch scorched3d-formatstring.patch 
	scorched3d-gcc41.patch scorched3d-help.patch 
	scorched3d-negint.patch scorched3d-openal.patch 
	scorched3d-opengl-without-context.patch scorched3d-pgsql.patch 
	scorched3d-sprintf.patch scorched3d-strxxx.patch 
Log Message:
* Mon Feb 13 2006 Hans de Goede  - 39.1-4
- Bump release and rebuild for new gcc4.1 and glibc.

* Sun Feb 12 2006  - 39.1-3
- fix server crashing with certain landscape types (patch 13)

* Sat Feb 11 2006  - 39.1-2
- upgrade to CVS snapshot of 20050929, as Debian does, but not to
  the newer apoc version as this causes problems playing online (patch 0)
- fix gcc41 compilation (patch 3)
- fix 64 bit compilation (bz 158646) (patch 4)
- fix compile with openal-0.9 (patch 5)
- use htmlview for helpfile viewing instead of hardcoded mozilla,
  run this in background so the game doesn't freeze (patch 6)
- fix all the security issues reported on the fulldisclosure mailinglist:
  http://seclists.org/lists/fulldisclosure/2005/Nov/0079.html
  (bz 161694) (patch 7, 8, 9, 10)
- fix 2 additonal security issues found while fixing the above (patch 11, 12)
- this release also fixes bz 161694

* Sat Oct  8 2005 Ville Skytt??  - 39.1-1
- 39.1.
- Avoid aclocal >= 1.8 warnings.
- Install icon into icons/hicolor.
- Clean up build dependencies.


scorched3d-64bit.patch:

--- NEW FILE scorched3d-64bit.patch ---
diff -ur scorched.orig/src/client/ClientConnectionAcceptHandler.cpp scorched/src/client/ClientConnectionAcceptHandler.cpp
--- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/client/ClientConnectionAcceptHandler.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -66,7 +66,9 @@
 
 	if (OptionsParam::instance()->getConnectedToServer())
 	{
-		unsigned int ip = NetServer::getIpAddress((TCPsocket) id);
+		NetServer *netServer = (NetServer *)
+			ScorchedClient::instance()->getContext().netInterface;
+		unsigned int ip = netServer->getIpAddress(id);
 		if (!ConnectDialog::instance()->getIdStore().saveUniqueId(
 			ip, message.getUniqueId(), message.getPublishAddress()))
 		{
diff -ur scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
--- scorched.orig/src/client/ServerBrowser.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/client/ServerBrowser.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -50,7 +50,7 @@
 
 int ServerBrowser::threadFunc(void *var)
 {
-	bool lan = (bool) (int(var)==1);
+	bool lan = (bool) (long(var)==1);
 	bool result = false;
 	if (lan) result = instance_->serverList_.fetchLANList();
 	else result = instance_->serverList_.fetchServerList();
diff -ur scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
--- scorched.orig/src/coms/NetServer.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/coms/NetServer.cpp	2006-02-09 16:48:09.000000000 +0100
@@ -33,6 +33,7 @@
 {
 	sockSet_ = SDLNet_AllocSocketSet(1);
 	setMutex_ = SDL_CreateMutex();
+	lastId_ = 0;
 	SDL_CreateThread(NetServer::threadFunc, (void *) this);
 }
 
@@ -66,7 +67,8 @@
 		{
 			NetMessage *message = (delayedMessages_.front()).second;
 			delayedMessages_.pop_front();
-			sendMessage((TCPsocket) message->getDestinationId(), message);
+			sendMessage(getServerRead(message->getDestinationId()),
+				message);
 		}
 	}
 
@@ -184,27 +185,25 @@
 bool NetServer::pollDeleted()
 {
 	SDL_LockMutex(setMutex_);
-	std::list remove;
-	std::map::iterator itor;
+	std::list remove;
+	std::map::iterator itor;
 	for (itor = connections_.begin();
 		itor != connections_.end();
 		itor++)
 	{
 		NetServerRead *serverRead = (*itor).second;
-		TCPsocket socket = (*itor).first;
 		if (serverRead->getDisconnect())
 		{
 			delete serverRead;
-			remove.push_back(socket);
+			remove.push_back((*itor).first);
 		}
 	}
-	std::list::iterator itor2;
+	std::list::iterator itor2;
 	for (itor2 = remove.begin();
 		itor2 != remove.end();
 		itor2++)
 	{
-		TCPsocket socket = (*itor2);
-		connections_.erase(socket);
+		connections_.erase((*itor2));
 	}
 	SDL_UnlockMutex(setMutex_);
 	return true;
@@ -212,13 +211,25 @@
 
 void NetServer::addClient(TCPsocket client)
 {
+	std::map::iterator itor;
+
+	// Find a free ID
+	SDL_LockMutex(setMutex_);
+	do {
+		lastId_++;
+		/* ID 0 == broadcast so don't use it */
+		if (lastId_ == 0)
+			lastId_++;
+		itor = connections_.find(lastId_);
+	} while (itor != connections_.end());
+	
 	// Create the thread to read this socket
-	NetServerRead *serverRead = new NetServerRead(
-		client, protocol_, &messageHandler_, &checkDeleted_, sentNotification_);
+	NetServerRead *serverRead = new NetServerRead(client, lastId_,
+		protocol_, &messageHandler_, &checkDeleted_,
+		sentNotification_);
 
 	// Add this to the collection of sockets (connections)
-	SDL_LockMutex(setMutex_);
-	connections_[client] = serverRead;
+	connections_[lastId_] = serverRead;
 	firstDestination_ = (*connections_.begin()).first;
 	SDL_UnlockMutex(setMutex_);
 
@@ -228,27 +238,23 @@
 
 void NetServer::disconnectAllClients()
 {
+	std::map::iterator itor;
 	SDL_LockMutex(setMutex_);
-	std::map::iterator itor;
 	for (itor = connections_.begin();
 		itor != connections_.end();
 		itor++)
 	{
-		TCPsocket sock = (*itor).first;
-		disconnectClient((unsigned int) sock);
+		disconnectClient((*itor).first);
 	}
 	SDL_UnlockMutex(setMutex_);
 }
 
 void NetServer::disconnectClient(unsigned int dest, bool delayed)
 {
-	TCPsocket client = (TCPsocket) dest;
-	DIALOG_ASSERT(client);
-
+	NetServerRead *serverRead = getServerRead(dest);
 	NetMessage *message = NetMessagePool::instance()->
 		getFromPool(NetMessage::DisconnectMessage, 
-				(unsigned int) client,
-				getIpAddress(client));
+				dest, getIpAddress(serverRead));
 
 	if (delayed)
 	{
@@ -258,26 +264,22 @@
 	else
 	{
 		// Add the message to the list of out going
-		sendMessage(client, message);
+		sendMessage(serverRead, message);
 	}
 }
 
 void NetServer::sendMessage(NetBuffer &buffer)
 {
-	sendMessage(buffer, (unsigned int) firstDestination_);
+	sendMessage(buffer, firstDestination_);
 }
 
 void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest)
-							
 {
-	TCPsocket destination = (TCPsocket) dest;
-	DIALOG_ASSERT(destination);
-
+	NetServerRead *serverRead = getServerRead(dest);
 	// Get a new buffer from the pool
 	NetMessage *message = NetMessagePool::instance()->
-		getFromPool(NetMessage::NoMessage, 
-				(unsigned int) destination,
-				getIpAddress(destination));
+		getFromPool(NetMessage::NoMessage, dest,
+				getIpAddress(serverRead));
 
 	// Add message to new buffer
 	message->getBuffer().allocate(buffer.getBufferUsed());
@@ -286,28 +288,37 @@
 	message->getBuffer().setBufferUsed(buffer.getBufferUsed());
 
 	// Send Mesage
-	sendMessage(destination, message);
+	sendMessage(serverRead, message);
 }
 
-void NetServer::sendMessage(TCPsocket client, NetMessage *message)
+void NetServer::sendMessage(NetServerRead *serverRead, NetMessage *message)
 {
-	// Find the client
-	SDL_LockMutex(setMutex_);
-	std::map::iterator itor = 
-		connections_.find(client);
-	if (itor != connections_.end()) 
+	if (serverRead)
 	{
 		// Add the message to the list of out going
-		NetServerRead *serverRead = (*itor).second;
 		serverRead->addMessage(message);
 	}
 	else
-	{
 		NetMessagePool::instance()->addToPool(message);
-		Logger::log( "Unknown sendMessage destination %i",
-			(int) client);
+}
+
+NetServerRead *NetServer::getServerRead(unsigned int dest)
+{
+	NetServerRead *serverRead = 0;
+	
+	if (dest)
+	{
+		SDL_LockMutex(setMutex_);
+		std::map::iterator itor = 
+			connections_.find(dest);
+		if (itor != connections_.end())
+			serverRead = (*itor).second;
+		else
+			Logger::log( "Unknown destination %u", dest);
+		SDL_UnlockMutex(setMutex_);
 	}
-	SDL_UnlockMutex(setMutex_);
+	
+	return serverRead;
 }
 
 unsigned int NetServer::getIpAddress(TCPsocket destination)
@@ -324,3 +335,14 @@
 	return addr;
 }
 
+unsigned int NetServer::getIpAddress(NetServerRead *serverRead)
+{
+	if (serverRead == 0) return 0;
+	
+	return getIpAddress(serverRead->getSocket());
+}
+
+unsigned int NetServer::getIpAddress(unsigned int destination)
+{
+	return getIpAddress(getServerRead(destination));
+}
diff -ur scorched.orig/src/coms/NetServer.h scorched/src/coms/NetServer.h
--- scorched.orig/src/coms/NetServer.h	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/coms/NetServer.h	2006-02-09 16:48:14.000000000 +0100
@@ -47,28 +47,32 @@
 	virtual void sendMessage(NetBuffer &buffer, unsigned int destination);
 	void setSentNotification() { sentNotification_ = true; }
 
+	unsigned int getIpAddress(unsigned int destination);
 	static unsigned int getIpAddress(TCPsocket destination);
 
 protected:
 	NetServerProtocol *protocol_;
 	TCPsocket server_;
-	TCPsocket firstDestination_;
+	unsigned int firstDestination_;
 	SDLNet_SocketSet sockSet_;
-	std::map connections_;
+	std::map connections_;
 	std::list > delayedMessages_;
 	Clock delayedClock_;
 	SDL_mutex *setMutex_;
 	NetMessageHandler messageHandler_;
 	bool checkDeleted_;
 	bool sentNotification_;
+	unsigned int lastId_;
 
 	static int threadFunc(void *);
 
 	bool pollIncoming();
 	bool pollDeleted();
 	void addClient(TCPsocket client);
-	void sendMessage(TCPsocket client, NetMessage *message);
-
+	void sendMessage(NetServerRead *serverRead, NetMessage *message);
+	NetServerRead *getServerRead(unsigned int dest);
+	unsigned int getIpAddress(NetServerRead *serverRead);
+	
 private:
 
 	NetServer(const NetServer &);
Only in scorched/src/coms: NetServer.h~
diff -ur scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
--- scorched.orig/src/coms/NetServerProtocol.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/coms/NetServerProtocol.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -40,7 +40,8 @@
 {
 }
 
-bool NetServerScorchedProtocol::sendBuffer(NetBuffer &buffer, TCPsocket socket)
+bool NetServerScorchedProtocol::sendBuffer(NetBuffer &buffer,
+	TCPsocket socket, unsigned int socketId)
 {
 	Uint32 len = buffer.getBufferUsed();
 	Uint32 netlen=0;
@@ -94,7 +95,8 @@
 	return true;
 }
 
-NetMessage *NetServerScorchedProtocol::readBuffer(TCPsocket socket)
+NetMessage *NetServerScorchedProtocol::readBuffer(TCPsocket socket,
+	unsigned int socketId)
 {
 	// receive the length of the string message
 	char lenbuf[4];
@@ -125,8 +127,7 @@
 	// allocate the buffer memory
 	NetMessage *buffer = NetMessagePool::instance()->
 		getFromPool(NetMessage::BufferMessage, 
-				(unsigned int) socket,
-				NetServer::getIpAddress(socket));
+				socketId, NetServer::getIpAddress(socket));
 	buffer->getBuffer().allocate(len);
 	buffer->getBuffer().setBufferUsed(len);
 
@@ -153,7 +154,8 @@
 {
 }
 
-bool NetServerCompressedProtocol::sendBuffer(NetBuffer &buffer, TCPsocket socket)
+bool NetServerCompressedProtocol::sendBuffer(NetBuffer &buffer,
+	TCPsocket socket, unsigned int socketId)
 {
 	unsigned long destLen = buffer.getBufferUsed() * 2;
 	unsigned long srcLen = buffer.getBufferUsed();
@@ -161,8 +163,7 @@
 	// Allocate a new buffer
 	NetMessage *newMessage = NetMessagePool::instance()->
 		getFromPool(NetMessage::BufferMessage, 
-				(unsigned int) socket,
-				NetServer::getIpAddress(socket));
+				socketId, NetServer::getIpAddress(socket));
 	NetBuffer &newBuffer = newMessage->getBuffer();
 	newBuffer.allocate(destLen);
 
@@ -185,7 +186,8 @@
 		//Logger::log( "Compressed %i->%i",
 		//			buffer.getBufferUsed(), newBuffer.getBufferUsed());
 
-		retVal = NetServerScorchedProtocol::sendBuffer(newBuffer, socket);
+		retVal = NetServerScorchedProtocol::sendBuffer(newBuffer,
+				socket, socketId);
 	}
 	else
 	{
@@ -197,10 +199,12 @@
 	return retVal;
 }
 
-NetMessage *NetServerCompressedProtocol::readBuffer(TCPsocket socket)
+NetMessage *NetServerCompressedProtocol::readBuffer(TCPsocket socket,
+	unsigned int socketId)
 {
 	// Read the message from the socket
-	NetMessage *message = NetServerScorchedProtocol::readBuffer(socket);
+	NetMessage *message = NetServerScorchedProtocol::readBuffer(socket,
+				socketId);
 	if (message)
 	{
 		// Get the uncompressed size from the buffer
@@ -268,7 +272,8 @@
 {
 }
 
-bool NetServerHTTPProtocolSend::sendBuffer(NetBuffer &buffer, TCPsocket socket)
+bool NetServerHTTPProtocolSend::sendBuffer(NetBuffer &buffer,
+	TCPsocket socket, unsigned int socketId)
 {
 	Uint32 len = buffer.getBufferUsed();
 	
@@ -286,13 +291,13 @@
 	return true;
 }
 
-NetMessage *NetServerHTTPProtocolSend::readBuffer(TCPsocket socket)
+NetMessage *NetServerHTTPProtocolSend::readBuffer(TCPsocket socket,
+	unsigned int socketId)
 {
 	// allocate the buffer memory
 	NetMessage *netBuffer = NetMessagePool::instance()->
 		getFromPool(NetMessage::BufferMessage,
-				(unsigned int) socket,
-				NetServer::getIpAddress(socket));
+				socketId, NetServer::getIpAddress(socket));
 	netBuffer->getBuffer().reset();
 
 	// get the string buffer over the socket
@@ -331,7 +336,8 @@
 {
 }
 
-bool NetServerHTTPProtocolRecv::sendBuffer(NetBuffer &buffer, TCPsocket socket)
+bool NetServerHTTPProtocolRecv::sendBuffer(NetBuffer &buffer,
+	TCPsocket socket, unsigned int socketId)
 {
 	Uint32 len = buffer.getBufferUsed();
 	
@@ -349,13 +355,13 @@
 	return true;
 }
 
-NetMessage *NetServerHTTPProtocolRecv::readBuffer(TCPsocket socket)
+NetMessage *NetServerHTTPProtocolRecv::readBuffer(TCPsocket socket,
+	unsigned int socketId)
 {
 	// allocate the buffer memory
 	NetMessage *netBuffer = NetMessagePool::instance()->
 		getFromPool(NetMessage::BufferMessage,
-				(unsigned int) socket,
-				NetServer::getIpAddress(socket));
+				socketId, NetServer::getIpAddress(socket));
 	netBuffer->getBuffer().reset();
 
 	// get the string buffer over the socket
diff -ur scorched.orig/src/coms/NetServerProtocol.h scorched/src/coms/NetServerProtocol.h
--- scorched.orig/src/coms/NetServerProtocol.h	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/coms/NetServerProtocol.h	2006-02-09 14:47:28.000000000 +0100
@@ -29,8 +29,10 @@
 	NetServerProtocol();
 	virtual ~NetServerProtocol();
 
-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket) = 0;
-	virtual NetMessage *readBuffer(TCPsocket socket) = 0;
+	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
+		unsigned int socketId) = 0;
+	virtual NetMessage *readBuffer(TCPsocket socket,
+		unsigned int socketId) = 0;
 };
 
 class NetServerScorchedProtocol : public NetServerProtocol
@@ -39,8 +41,10 @@
 	NetServerScorchedProtocol();
 	virtual ~NetServerScorchedProtocol();
 
-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket);
-	virtual NetMessage *readBuffer(TCPsocket socket);
+	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
+		unsigned int socketId);
+	virtual NetMessage *readBuffer(TCPsocket socket,
+		unsigned int socketId);
 };
 
 class NetServerCompressedProtocol : public NetServerScorchedProtocol
@@ -49,8 +53,10 @@
 	NetServerCompressedProtocol();
 	virtual ~NetServerCompressedProtocol();
 
-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket);
-	virtual NetMessage *readBuffer(TCPsocket socket);
+	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
+		unsigned int socketId);
+	virtual NetMessage *readBuffer(TCPsocket socket,
+		unsigned int socketId);
 };
 
 class NetServerHTTPProtocolSend : public NetServerProtocol
@@ -59,8 +65,10 @@
 	NetServerHTTPProtocolSend();
 	virtual ~NetServerHTTPProtocolSend();
 
-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket);
-	virtual NetMessage *readBuffer(TCPsocket socket);
+	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
+		unsigned int socketId);
+	virtual NetMessage *readBuffer(TCPsocket socket,
+		unsigned int socketId);
 };
 
 class NetServerHTTPProtocolRecv : public NetServerProtocol
@@ -69,8 +77,10 @@
 	NetServerHTTPProtocolRecv();
 	virtual ~NetServerHTTPProtocolRecv();
 
-	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket);
-	virtual NetMessage *readBuffer(TCPsocket socket);
+	virtual bool sendBuffer(NetBuffer &buffer, TCPsocket socket,
+		unsigned int socketId);
+	virtual NetMessage *readBuffer(TCPsocket socket,
+		unsigned int socketId);
 };
 
 #endif
diff -ur scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
--- scorched.orig/src/coms/NetServerRead.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/coms/NetServerRead.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -26,11 +26,12 @@
 #include 
 
 NetServerRead::NetServerRead(TCPsocket socket,
+							 unsigned int socketId,
 							 NetServerProtocol *protocol,
 							 NetMessageHandler *messageHandler,
 							 bool *checkDeleted,
 							 bool sentNotification) : 
-	socket_(socket), sockSet_(0), protocol_(protocol), 
+	socket_(socket), socketId_(socketId), sockSet_(0), protocol_(protocol), 
 	outgoingMessagesMutex_(0), checkDeleted_(checkDeleted),
 	disconnect_(false), messageHandler_(messageHandler),
 	sentDisconnect_(false), startCount_(0),
@@ -64,8 +65,7 @@
 	// Send the player connected notification
 	NetMessage *message = NetMessagePool::instance()->
 		getFromPool(NetMessage::ConnectMessage, 
-		(unsigned int) socket_,
-		NetServer::getIpAddress(socket_));
+		socketId_, NetServer::getIpAddress(socket_));
 	messageHandler_->addMessage(message);
 
 	recvThread_ = SDL_CreateThread(
@@ -96,8 +96,7 @@
 		sentDisconnect_ = true;
 		NetMessage *message = NetMessagePool::instance()->
 			getFromPool(NetMessage::DisconnectMessage, 
-				(unsigned int) socket_,
-				NetServer::getIpAddress(socket_));
+				socketId_, NetServer::getIpAddress(socket_));
 		messageHandler_->addMessage(message);
 	}
 	SDL_UnlockMutex(outgoingMessagesMutex_);
@@ -189,9 +188,9 @@
 		if (timeDiff > 15.0f)
 		{
 			Logger::log( 
-				"Warning: %s net loop took %.2f seconds, client %i", 
+				"Warning: %s net loop took %.2f seconds, client %u", 
 				(send?"Send":"Recv"),
-				timeDiff, (unsigned int) socket_);
+				timeDiff, socketId_);
 		}
 	}
 
@@ -201,8 +200,7 @@
 		sentDisconnect_ = true;
 		NetMessage *message = NetMessagePool::instance()->
 			getFromPool(NetMessage::DisconnectMessage, 
-				(unsigned int) socket_,
-				NetServer::getIpAddress(socket_));
+				socketId_, NetServer::getIpAddress(socket_));
 		messageHandler_->addMessage(message);
 	}
 	SDL_UnlockMutex(outgoingMessagesMutex_);
@@ -220,7 +218,8 @@
 
 	if(SDLNet_SocketReady(socket_))
 	{
-		NetMessage *message = protocol_->readBuffer(socket_);
+		NetMessage *message = protocol_->readBuffer(socket_,
+					socketId_);
 		if (!message)
 		{
 			Logger::log( "Client socket has been closed.");
@@ -263,7 +262,8 @@
 		}
 		else
 		{
-			if (!protocol_->sendBuffer(message->getBuffer(), socket_))
+			if (!protocol_->sendBuffer(message->getBuffer(),
+				socket_, socketId_))
 			{
 				Logger::log( "Failed to send message to client");
 				result = false;
@@ -276,7 +276,7 @@
 		{
 			NetMessage *notification = NetMessagePool::instance()->
 				getFromPool(NetMessage::SentMessage,
-					(unsigned int) socket_,
+					socketId_,
 					NetServer::getIpAddress(socket_));
 			messageHandler_->addMessage(notification);
 		}
diff -ur scorched.orig/src/coms/NetServerRead.h scorched/src/coms/NetServerRead.h
--- scorched.orig/src/coms/NetServerRead.h	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/coms/NetServerRead.h	2006-02-09 14:47:28.000000000 +0100
@@ -28,6 +28,7 @@
 {
 public:
 	NetServerRead(TCPsocket socket,
+		unsigned int socketId,
 		NetServerProtocol *protocol,
 		NetMessageHandler *messageHandler,
 		bool *checkDeleted,
@@ -37,12 +38,14 @@
 	void start();
 	bool getDisconnect();
 	void addMessage(NetMessage *message);
+	TCPsocket getSocket() { return socket_; }
 
 protected:
 	bool *checkDeleted_;
 	bool disconnect_, sentDisconnect_;
 	bool sentNotification_;
 	TCPsocket socket_;
+	unsigned int socketId_;
 	SDLNet_SocketSet sockSet_;
 	NetServerProtocol *protocol_;
 	NetMessageHandler *messageHandler_;
diff -ur scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
--- scorched.orig/src/dialogs/HelpButtonDialog.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/dialogs/HelpButtonDialog.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -160,7 +160,7 @@
 
 void HelpButtonDialog::itemSelected(GLWSelectorEntry *entry, int position)
 {
-	int data = (int) entry->getUserData();
+	long data = (long) entry->getUserData();
 	if (data != -1)
 	{
 		int volume = int(float(data) * 12.8f);
diff -ur scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
--- scorched.orig/src/engine/ScorchedCollisionHandler.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/engine/ScorchedCollisionHandler.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -93,7 +93,7 @@
 	}
 
 	ShotBounce *particle = (ShotBounce *) bounceInfo->data;
-	unsigned int id = (unsigned int) otherInfo->data;
+	unsigned int id = (unsigned long) otherInfo->data;
 
 	// only collide with the ground, walls or landscape,
 	// or iteself
@@ -217,7 +217,7 @@
 		otherInfo = (ScorchedCollisionInfo *) dGeomGetData(o1);
 	}
 
-	unsigned int id = (unsigned int) otherInfo->data;
+	unsigned int id = (unsigned long) otherInfo->data;
 	ShotProjectile *shot = (ShotProjectile *) particleInfo->data;
 	shot->incLandedCounter();
 	Vector particlePositionV(
diff -ur scorched.orig/src/ode/config.h scorched/src/ode/config.h
--- scorched.orig/src/ode/config.h	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/ode/config.h	2006-02-09 14:47:28.000000000 +0100
@@ -81,7 +81,7 @@
 /* an integer type that we can safely cast a pointer to and from without
  * loss of bits.
  */
-typedef unsigned int intP;
+typedef unsigned long intP;
 
 
 /* if we're compiling on a pentium, we may need to know the clock rate so
diff -ur scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
--- scorched.orig/src/scorched/SettingsDialog.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/scorched/SettingsDialog.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -748,44 +748,44 @@
 
 	// Env
 	{
-		context_.setWindForce((OptionsGame::WindForce) (int)
+		context_.setWindForce((OptionsGame::WindForce) (long)
 			SettingsEnv::IDC_COMBO_FORCE_CTRL->GetClientData(
 				SettingsEnv::IDC_COMBO_FORCE_CTRL->GetSelection()));
 
-		context_.setWindType((OptionsGame::WindType) (int)
+		context_.setWindType((OptionsGame::WindType) (long)
 			SettingsEnv::IDC_COMBO_WINDCHANGES_CTRL->GetClientData(
 				SettingsEnv::IDC_COMBO_WINDCHANGES_CTRL->GetSelection()));
 
-		context_.setWallType((OptionsGame::WallType) (int)
+		context_.setWallType((OptionsGame::WallType) (long)
 			SettingsEnv::IDC_COMBO_WALLTYPE_CTRL->GetClientData(
 				SettingsEnv::IDC_COMBO_WALLTYPE_CTRL->GetSelection()));
 
-		context_.setWeapScale((OptionsGame::WeapScale) (int)
+		context_.setWeapScale((OptionsGame::WeapScale) (long)
 			SettingsEnv::IDC_COMBO_WEAPONSCALE_CTRL->GetClientData(
 				SettingsEnv::IDC_COMBO_WEAPONSCALE_CTRL->GetSelection()));
 
-		context_.setStartArmsLevel((int) 
+		context_.setStartArmsLevel((long) 
 			SettingsEnv::IDC_COMBO_STARTARMSLEVEL_CTRL->GetClientData(
 				SettingsEnv::IDC_COMBO_STARTARMSLEVEL_CTRL->GetSelection()));
 
-		context_.setEndArmsLevel((int) 
+		context_.setEndArmsLevel((long) 
 			SettingsEnv::IDC_COMBO_ENDARMSLEVEL_CTRL->GetClientData(
 				SettingsEnv::IDC_COMBO_ENDARMSLEVEL_CTRL->GetSelection()));
-		context_.setMinFallingDistance((int) 
+		context_.setMinFallingDistance((long) 
 			SettingsEnv::IDC_COMBO_FALLINGDISTANCE_CTRL->GetClientData(
 				SettingsEnv::IDC_COMBO_FALLINGDISTANCE_CTRL->GetSelection()));
-		context_.setMaxClimbingDistance((int) 
+		context_.setMaxClimbingDistance((long) 
 			SettingsEnv::IDC_COMBO_CLIMBINGDISTANCE_CTRL->GetClientData(
 				SettingsEnv::IDC_COMBO_CLIMBINGDISTANCE_CTRL->GetSelection()));
 
 		context_.setGiveAllWeapons(
 			SettingsEnv::IDC_GIVEALLWEAPONS_CTRL->GetValue());
 
-		context_.setResignMode((OptionsGame::ResignType) (int)
+		context_.setResignMode((OptionsGame::ResignType) (long)
 			SettingsEnv::IDC_RESIGNENDROUND_CTRL->GetClientData(
 				SettingsEnv::IDC_RESIGNENDROUND_CTRL->GetSelection()));
 
-		context_.setMovementRestriction((OptionsGame::MovementRestrictionType) (int)
+		context_.setMovementRestriction((OptionsGame::MovementRestrictionType) (long)
 			SettingsEnv::IDC_MOVEMENTRESTRICTION_CTRL->GetClientData(
 				SettingsEnv::IDC_MOVEMENTRESTRICTION_CTRL->GetSelection()));
 	}
@@ -809,10 +809,10 @@
 		int downloadSpeed = 0;
 		int keepAliveTime = 0;
 
-		context_.setTurnType((OptionsGame::TurnType) (int) 
+		context_.setTurnType((OptionsGame::TurnType) (long) 
 			SettingsMain::IDC_TYPE_CTRL->GetClientData(
 				SettingsMain::IDC_TYPE_CTRL->GetSelection()));
-		context_.setTeamBallance((OptionsGame::TeamBallanceType) (int)
+		context_.setTeamBallance((OptionsGame::TeamBallanceType) (long)
 			SettingsMain::IDC_TEAMBALLANCE_CTRL->GetClientData(
 				SettingsMain::IDC_TEAMBALLANCE_CTRL->GetSelection()));			
 		context_.setTeams((int) SettingsMain::IDC_TEAMS_CTRL->GetSelection() + 1);
diff -ur scorched.orig/src/server/ServerConnectHandler.cpp scorched/src/server/ServerConnectHandler.cpp
--- scorched.orig/src/server/ServerConnectHandler.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/server/ServerConnectHandler.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -87,7 +87,9 @@
 		}
 
 		// Get the ip address
-		ipAddress = NetServer::getIpAddress((TCPsocket) destinationId);
+		NetServer *netServer = (NetServer *)
+			ScorchedServer::instance()->getContext().netInterface;
+		ipAddress = netServer->getIpAddress(destinationId);
 	}
 
 	// Decode the connect message
diff -ur scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
--- scorched.orig/src/tankgraph/GLWTankTip.cpp	2006-02-09 14:52:14.000000000 +0100
+++ scorched/src/tankgraph/GLWTankTip.cpp	2006-02-09 14:47:28.000000000 +0100
@@ -66,7 +66,7 @@
 
 void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position)
 {
-	tank_->getPhysics().revertSettings((unsigned int) entry->getUserData());
+	tank_->getPhysics().revertSettings((unsigned long) entry->getUserData());
 }
 
 TankFuelTip::TankFuelTip(Tank *tank) : 
@@ -170,7 +170,7 @@
 void TankBatteryTip::itemSelected(GLWSelectorEntry *entry, int position)
 {
 	TankAIHuman *tankAI = (TankAIHuman *) tank_->getTankAI();
-	for (int i=1; i<=(int) entry->getUserData(); i++)
+	for (int i=1; i<=(long) entry->getUserData(); i++)
 	{
 		if (tank_->getState().getLife() < 100.0f)
 		{

scorched3d-HTML-injection.patch:

--- NEW FILE scorched3d-HTML-injection.patch ---
--- scorched/src/server/ServerWebHandler.cpp.injection	2006-02-11 18:43:38.000000000 +0100
+++ scorched/src/server/ServerWebHandler.cpp	2006-02-11 19:05:51.000000000 +0100
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 static const char *getField(std::map &fields, const char *field)
 {
@@ -117,6 +118,9 @@
 	for (itor = tanks.begin(); itor != tanks.end(); itor++)
 	{
 		Tank *tank = (*itor).second;
+		std::string cleanName;
+		std::string dirtyName(tank->getName());
+		XMLParser::removeSpecialChars(dirtyName, cleanName);
 		players += formatString(
 			""
 			"dest=%i ip=%s id=%i" // Id
@@ -129,7 +133,7 @@
 			"" // Select
 			"\n",
 			tank->getDestinationId(), NetInterface::getIpName(tank->getIpAddress()), tank->getPlayerId(),
-			tank->getName(),
+			cleanName.c_str(),
 			tank->getTankAI()?tank->getTankAI()->getName():"Human",
 			tank->getScore().getTimePlayedString(),
 			tank->getScore().getScoreString(),
@@ -178,13 +182,15 @@
 	int max = MIN((int) entries.size(), start + pagesize);
 	for (int i=min; i"
 			"%u"
 			"%s"
 			"\n",
 			i,
-			entries[i].text.c_str());
+			cleanText.c_str());
 	}
 	fields["LOG"] = log;
 
@@ -335,7 +341,9 @@
 		textsListItor != textsList.end();
 		textsListItor++)
 	{
-		texts += (*textsListItor);
+		std::string cleanText;
+		XMLParser::removeSpecialChars((*textsListItor), cleanText);
+		texts += cleanText;
 		texts += "
    \n";
 	}
 	fields["TEXTS"] = texts;
@@ -375,11 +383,13 @@
 			if (selected && 0 == strcmp(selected, ipName.c_str()))
 				entry.type = ServerBanned::NotBanned;
 
+			std::string cleanName;
+			XMLParser::removeSpecialChars(entry.name, cleanName);
 			banned += formatString("%s%s%s%s%s%s"
 				"" // Select
 				"",
 				(entry.bantime?ctime(&entry.bantime):""),
-				entry.name.c_str(),
+				cleanName.c_str(),
 				entry.uniqueid.c_str(),
 				ServerBanned::getBannedTypeStr(entry.type),
 				ipName.c_str(), mask.c_str(),
@@ -407,8 +417,11 @@
 		itor++)
 	{
 		ModFileEntry *entry = (*itor).second;
+		std::string cleanFileName;
+		std::string dirtyFileName(entry->getFileName());
+		XMLParser::removeSpecialChars(dirtyFileName, cleanFileName);
 		modfiles += formatString("%s%u%u%u",
-			entry->getFileName(), 
+			cleanFileName.c_str(),
 			entry->getCompressedSize(),
 			entry->getCompressedCrc(),
 			entry->getUncompressedSize());

scorched3d-XML-injection.patch:

--- NEW FILE scorched3d-XML-injection.patch ---
diff -ur scorched.orig/src/GLEXT/GLConsoleFileReader.cpp scorched/src/GLEXT/GLConsoleFileReader.cpp
--- scorched.orig/src/GLEXT/GLConsoleFileReader.cpp	2006-02-11 15:40:45.000000000 +0100
+++ scorched/src/GLEXT/GLConsoleFileReader.cpp	2006-02-11 15:45:05.000000000 +0100
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 bool GLConsoleFileReader::loadFileIntoConsole(const char *fileName,
@@ -62,15 +63,18 @@
 		itor != lines.end();
 		itor++)
 	{
-		std::string string;
-		const char *line = (*itor)->getLine();
+		std::string cleanLine;
+		std::string dirtyLine((*itor)->getLine());
+		XMLParser::removeSpecialChars(dirtyLine, cleanLine);
 		if ((*itor)->getLineType() != GLConsoleLine::eNone)
 		{
-			filelines.addLine("  %s", line);
+			filelines.addLine("  %s",
+				cleanLine.c_str());
 		}
 		else
 		{
-			filelines.addLine("  ", line);
+			filelines.addLine("  ",
+				cleanLine.c_str());
 		}
 	}
 
Only in scorched/src/GLEXT: GLConsoleFileReader.cpp~
diff -ur scorched.orig/src/XML/XMLParser.cpp scorched/src/XML/XMLParser.cpp
--- scorched.orig/src/XML/XMLParser.cpp	2006-02-11 15:40:45.000000000 +0100
+++ scorched/src/XML/XMLParser.cpp	2006-02-11 15:39:50.000000000 +0100
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-static void removeSpecialChars(std::string &content, std::string &result)
+void XMLParser::removeSpecialChars(std::string &content, std::string &result)
 {
 	result = "";
 	for (char *c=(char *) content.c_str(); *c; c++)
@@ -174,7 +174,7 @@
 			DIALOG_ASSERT(node->type_ == XMLParameterType);
 			
 			std::string newContent;
-			removeSpecialChars(node->content_, newContent);
+			XMLParser::removeSpecialChars(node->content_, newContent);
 			
 			params += " " + node->name_ + "='" + newContent + "'";
 		}
@@ -182,7 +182,7 @@
 		if (children_.empty())
 		{
 			std::string newContent;
-			removeSpecialChars(content_, newContent);
+			XMLParser::removeSpecialChars(content_, newContent);
 			
 			lines.addLine("%s<%s%s>%s", 
 				getSpacer(spacing),
diff -ur scorched.orig/src/XML/XMLParser.h scorched/src/XML/XMLParser.h
--- scorched.orig/src/XML/XMLParser.h	2006-02-11 15:40:45.000000000 +0100
+++ scorched/src/XML/XMLParser.h	2006-02-11 15:39:50.000000000 +0100
@@ -121,6 +121,9 @@
 	void setSource(const char *source) { source_ = source; }
 	XMLNode *getRoot() { return root_; }
 
+	static void removeSpecialChars(std::string &content,
+		std::string &result);
+
 protected:
 	XMLNode *root_;
 	XMLNode *current_;
diff -ur scorched.orig/src/weapons/EconomyFreeMarket.cpp scorched/src/weapons/EconomyFreeMarket.cpp
--- scorched.orig/src/weapons/EconomyFreeMarket.cpp	2006-02-11 15:40:45.000000000 +0100
+++ scorched/src/weapons/EconomyFreeMarket.cpp	2006-02-11 15:48:19.000000000 +0100
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -123,8 +124,11 @@
 			accessory->getStartingNumber() != -1 && 
 			accessory->getType() == AccessoryPart::AccessoryWeapon)
 		{
+			std::string cleanName;
+			std::string dirtyName(accessory->getName());
+			XMLParser::removeSpecialChars(dirtyName, cleanName);
 			file.addLine("  ");
-			file.addLine("    %s", accessory->getName());
+			file.addLine("    %s", cleanName.c_str());
 			file.addLine("    %i", accessory->getPrice());
 			file.addLine("  ");
 		}
Only in scorched/src/weapons: EconomyFreeMarket.cpp~

scorched3d-aclocal18.patch:

--- NEW FILE scorched3d-aclocal18.patch ---
--- acinclude.m4~	2004-05-26 15:01:15.000000000 +0300
+++ acinclude.m4	2005-10-08 00:45:36.000000000 +0300
@@ -8,7 +8,7 @@
 dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
 dnl
-AC_DEFUN(AM_PATH_SDL,
+AC_DEFUN([AM_PATH_SDL],
 [dnl 
 dnl Get the cflags and libraries from the sdl-config script
 dnl
@@ -220,7 +220,7 @@
 dnl command line options
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN(AM_OPTIONS_WXCONFIG,
+AC_DEFUN([AM_OPTIONS_WXCONFIG],
 [
    AC_ARG_WITH(wx-prefix, [  --with-wx-prefix=PREFIX   Prefix where wxWindows is installed (optional)],
                wx_config_prefix="$withval", wx_config_prefix="")
@@ -243,7 +243,7 @@
 dnl
 dnl Get the cflags and libraries from the wx-config script
 dnl
-AC_DEFUN(AM_PATH_WXCONFIG,
+AC_DEFUN([AM_PATH_WXCONFIG],
 [
   dnl do we have wx-config name: it can be wx-config or wxd-config or ...
   if test x${WX_CONFIG_NAME+set} != xset ; then

scorched3d-cvs-20050929.patch:

--- NEW FILE scorched3d-cvs-20050929.patch ---
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/autogen.sh scorched-cvs/autogen.sh
--- scorched/autogen.sh	2003-08-03 23:57:10.000000000 +0200
+++ scorched-cvs/autogen.sh	2005-09-29 17:28:35.000000000 +0200
@@ -2,4 +2,4 @@
 aclocal
 automake --foreign
 autoconf
-./configure $*
+#./configure $*
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/3dsparse/MSModelFactory.cpp scorched-cvs/src/3dsparse/MSModelFactory.cpp
--- scorched/src/3dsparse/MSModelFactory.cpp	2005-04-12 00:19:08.000000000 +0200
+++ scorched-cvs/src/3dsparse/MSModelFactory.cpp	2005-09-22 17:14:27.000000000 +0200
@@ -304,7 +304,7 @@
 				if (textureName[1]) // as the string starts with a "
 				{
 					mesh->setTextureName(fullTextureName);
-					if (!fileExists(fullTextureName))
+					if (!DefinesUtil::fileExists(fullTextureName))
 					{
 						returnError(fileName, 
 							formatString("Failed to find texture \"%s\"",
@@ -314,7 +314,7 @@
 				if (textureNameAlpha[1])
 				{
 					mesh->setATextureName(fullTextureAlphaName);
-					if (!fileExists(fullTextureAlphaName))
+					if (!DefinesUtil::fileExists(fullTextureAlphaName))
 					{
 						returnError(fileName,
 							formatString("Failed to find alpha texture \"%s\"",
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/3dsparse/ModelID.cpp scorched-cvs/src/3dsparse/ModelID.cpp
--- scorched/src/3dsparse/ModelID.cpp	2005-04-12 00:19:08.000000000 +0200
+++ scorched-cvs/src/3dsparse/ModelID.cpp	2005-09-22 17:14:27.000000000 +0200
@@ -76,7 +76,7 @@
 		const char *meshNameContent = meshNode->getContent();
 		static char meshName[1024];
 		sprintf(meshName, "%s/%s", directory, meshNameContent);
-		if (!::wxFileExists(getDataFile(meshName)))
+		if (!DefinesUtil::fileExists(getDataFile(meshName)))
 		{
 			dialogMessage("Scorched Models",
 						"Mesh file \"%s\"does not exist",
@@ -90,7 +90,7 @@
 		if (strcmp(skinNameContent, "none") != 0)
 		{
 			sprintf(skinName, "%s/%s", directory, skinNameContent);
-			if (!::wxFileExists(getDataFile(skinName)))
+			if (!DefinesUtil::fileExists(getDataFile(skinName)))
 			{
 				dialogMessage("Scorched Models",
 							"Skin file \"%s\" does not exist",
@@ -112,7 +112,7 @@
 		static char meshName[1024];
 		sprintf(meshName, "%s/%s", directory, meshNameContent);
 
-		if (!::wxFileExists(getDataFile(meshName)))
+		if (!DefinesUtil::fileExists(getDataFile(meshName)))
 		{
 			dialogMessage("Scorched Models",
 						"Mesh file \"%s\"does not exist",
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/GLEXT/GLGif.cpp scorched-cvs/src/GLEXT/GLGif.cpp
--- scorched/src/GLEXT/GLGif.cpp	2005-07-13 14:51:49.000000000 +0200
+++ scorched-cvs/src/GLEXT/GLGif.cpp	2005-09-22 17:14:27.000000000 +0200
@@ -47,7 +47,7 @@
 
 bool GLGif::loadFromFile(const char * filename)
 {
-	wxString file(filename);
+	wxString file(filename, wxConvUTF8);
 	wxFileInputStream ifStream(file);
 	if (!ifStream.Ok()) return false;
 	return loadFromStream(&ifStream);
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/GLEXT/GLState.h scorched-cvs/src/GLEXT/GLState.h
--- scorched/src/GLEXT/GLState.h	2005-06-07 23:50:43.000000000 +0200
+++ scorched-cvs/src/GLEXT/GLState.h	2005-09-18 11:59:33.000000000 +0200
@@ -27,6 +27,7 @@
 #define AFX_GLSTATE_H__32B0E2D0_566D_4438_94E4_B12FE82430B1__INCLUDED_
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+#undef __MACH__
 #include 
 #include 
 
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/GLW/GLWPlanView.cpp scorched-cvs/src/GLW/GLWPlanView.cpp
--- scorched/src/GLW/GLWPlanView.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched-cvs/src/GLW/GLWPlanView.cpp	2005-09-22 17:14:27.000000000 +0200
@@ -244,7 +244,9 @@
 		// Draw a line pointing where the current tank is looking
 		glBegin(GL_LINES);
 			glVertex2f(0.0f, 0.0f);
-			glVertex2f(getFastSin(rot) * 0.07f, getFastCos(rot) * 0.07f);
+			glVertex2f(
+				DefinesUtil::getFastSin(rot) * 0.07f, 
+				DefinesUtil::getFastCos(rot) * 0.07f);
 		glEnd();
 	glPopMatrix();
 
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/actions/Explosion.cpp scorched-cvs/src/actions/Explosion.cpp
--- scorched/src/actions/Explosion.cpp	2005-08-20 22:17:58.000000000 +0200
+++ scorched-cvs/src/actions/Explosion.cpp	2005-09-18 12:39:34.000000000 +0200
@@ -197,8 +197,6 @@
 			if (0 != strcmp(weapon_->getParent()->getName(), "Death's Head") || // Ooo nasty
 				RAND < 0.2f)
 			{
-				Logger::log("Death...");
-
 				context_->actionController->addAction(
 					new SpriteAction(
 					new ExplosionNukeRenderer(position_, weapon_->getSize() - 2.0f)));	
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/actions/TankResign.cpp scorched-cvs/src/actions/TankResign.cpp
--- scorched/src/actions/TankResign.cpp	2005-04-05 00:35:23.000000000 +0200
+++ scorched-cvs/src/actions/TankResign.cpp	2005-09-18 12:39:34.000000000 +0200
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 REGISTER_ACTION_SOURCE(TankResign);
@@ -60,8 +61,10 @@
 			if (!context_->serverMode ||
 				OptionsParam::instance()->getDedicatedServer())
 			{
-				Logger::log( 
-					"\"%s\" resigned from round", tank->getName());
+				LoggerInfo info(LoggerInfo::TypeDeath,
+					formatString("\"%s\" resigned from round", tank->getName()));
+				info.setPlayerId(playerId_);
+				Logger::log(info);
 			}
 		}
 	}
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/client/ClientConnectionAcceptHandler.cpp scorched-cvs/src/client/ClientConnectionAcceptHandler.cpp
--- scorched/src/client/ClientConnectionAcceptHandler.cpp	2005-06-27 02:55:47.000000000 +0200
+++ scorched-cvs/src/client/ClientConnectionAcceptHandler.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -109,7 +109,7 @@
 	}
 
 	// Set the mod
-	setDataFileMod(
+	DefinesUtil::setDataFileMod(
 		ScorchedClient::instance()->getOptionsGame().getMod());
 
 	// Load any mod files we currently have for the mod
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/client/ClientKeepAliveSender.cpp scorched-cvs/src/client/ClientKeepAliveSender.cpp
--- scorched/src/client/ClientKeepAliveSender.cpp	2005-04-03 14:46:43.000000000 +0200
+++ scorched-cvs/src/client/ClientKeepAliveSender.cpp	2005-09-18 12:39:34.000000000 +0200
@@ -56,7 +56,7 @@
 		ScorchedClient::instance()->getOptionsGame().getKeepAliveTime();
 	unsigned int theTime = (unsigned int) time(0);
 
-	if (theTime - lastSendTime_ > sendTime)
+	if (theTime - lastSendTime_ >= sendTime)
 	{
 		ComsKeepAliveMessage message;
 		ComsMessageSender::sendToServer(message);
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/client/ClientRmPlayerHandler.cpp scorched-cvs/src/client/ClientRmPlayerHandler.cpp
--- scorched/src/client/ClientRmPlayerHandler.cpp	2005-04-05 00:35:23.000000000 +0200
+++ scorched-cvs/src/client/ClientRmPlayerHandler.cpp	2005-09-18 12:39:34.000000000 +0200
@@ -61,12 +61,6 @@
 	{
 		Logger::log( "Failed to find player to remove");
 	}
-	else
-	{
-		// Print out info about removed tank
-		Logger::log( "Player disconnected \"%s\"",
-					tank->getName());	
-	}
 
     delete tank;
 	return true;
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/client/ClientSave.cpp scorched-cvs/src/client/ClientSave.cpp
--- scorched/src/client/ClientSave.cpp	2005-08-20 22:17:58.000000000 +0200
+++ scorched-cvs/src/client/ClientSave.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -112,7 +112,9 @@
 	if (0 != strcmp(version.c_str(), ScorchedProtocolVersion))
 	{
 		dialogMessage("LoadGame", 
-			"ERROR: Saved file version %s does not match game version %s",
+			"ERROR: Saved file version does not match game version.\n"
+			"Saved version : %s\n"
+			"Current version : %s\n",
 			version.c_str(),
 			ScorchedProtocolVersion);
 		return false;
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/client/TargetCamera.cpp scorched-cvs/src/client/TargetCamera.cpp
--- scorched/src/client/TargetCamera.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched-cvs/src/client/TargetCamera.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -304,8 +304,8 @@
 	case CamTank:
 		{
 			Vector newPos(
-				getFastSin(currentRotation) * 8.0f, 
-				getFastCos(currentRotation) * 8.0f,
+				DefinesUtil::getFastSin(currentRotation) * 8.0f, 
+				DefinesUtil::getFastCos(currentRotation) * 8.0f,
 				0.0f);
[...4288 lines suppressed...]
--- scorched/src/server/ServerBrowserInfo.cpp	2005-08-08 11:37:24.000000000 +0200
+++ scorched-cvs/src/server/ServerBrowserInfo.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -166,7 +166,7 @@
 	reply.push_back(addTag("round", formatString("%i/%i",
 		ScorchedServer::instance()->getOptionsTransient().getCurrentRoundNo(),
 		ScorchedServer::instance()->getOptionsGame().getNoRounds())));
-	reply.push_back(addTag("os", osDesc.c_str()));
+	reply.push_back(addTag("os", osDesc.mb_str(wxConvUTF8)));
 }
 
 void ServerBrowserInfo::processInfoMessage(std::list &reply)
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/server/ServerMain.cpp scorched-cvs/src/server/ServerMain.cpp
--- scorched/src/server/ServerMain.cpp	2005-06-20 02:35:08.000000000 +0200
+++ scorched-cvs/src/server/ServerMain.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -121,7 +121,7 @@
 	ServerDefenseHandler::instance();
 
 	// Set the mod
-	setDataFileMod(
+	DefinesUtil::setDataFileMod(
 		ScorchedServer::instance()->getOptionsGame().getMod());
 
 	// Load mod
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/server/ServerMessageHandler.cpp scorched-cvs/src/server/ServerMessageHandler.cpp
--- scorched/src/server/ServerMessageHandler.cpp	2005-06-20 02:35:08.000000000 +0200
+++ scorched-cvs/src/server/ServerMessageHandler.cpp	2005-09-18 12:39:34.000000000 +0200
@@ -115,6 +115,8 @@
 			"Player disconnected dest=\"%i\" id=\"%i\" name=\"%s\"", 
 			tank->getDestinationId(),
 			tankId, tank->getName());
+		ServerCommon::sendString(0, "Player disconnected \"%s\"",
+			tank->getName());
 
 		StatsLogger::instance()->tankDisconnected(tank);
 
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/server/ServerTextFilter.cpp scorched-cvs/src/server/ServerTextFilter.cpp
--- scorched/src/server/ServerTextFilter.cpp	2005-08-14 21:11:42.000000000 +0200
+++ scorched-cvs/src/server/ServerTextFilter.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -86,7 +86,7 @@
 		for (witor = words_.begin(); witor != words_.end(); witor++)
 		{
 			const char *word = (*witor).c_str();
-			char *pos = my_stristr(text, word);
+			char *pos = DefinesUtil::my_stristr(text, word);
 			if (pos)
 			{
 				// If they do then * out the word
@@ -149,9 +149,9 @@
 	const char *filename = 
 		getSettingsFile("filter-%i.txt", 
 			ScorchedServer::instance()->getOptionsGame().getPortNo());
-	if (!::wxFileExists(filename)) return;
+	if (!::DefinesUtil::fileExists(filename)) return;
 
-	time_t fileTime = ::wxFileModificationTime(filename);
+	time_t fileTime = ::wxFileModificationTime(wxString(filename, wxConvUTF8));
 	if (fileTime == lastReadTime_) return;
 
     FileLines lines;
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/server/ServerTimedMessage.cpp scorched-cvs/src/server/ServerTimedMessage.cpp
--- scorched/src/server/ServerTimedMessage.cpp	2005-06-20 02:35:08.000000000 +0200
+++ scorched-cvs/src/server/ServerTimedMessage.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -76,9 +76,9 @@
 	const char *filename = 
 		getSettingsFile("messages-%i.xml", 
 			ScorchedServer::instance()->getOptionsGame().getPortNo());
-	if (!::wxFileExists(filename)) return true;
+	if (!DefinesUtil::fileExists(filename)) return true;
 
-	time_t fileTime = ::wxFileModificationTime(filename);
+	time_t fileTime = ::wxFileModificationTime(wxString(filename, wxConvUTF8));
 	if (fileTime == lastReadTime_) return true;
 
 	XMLFile file;
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/sound/Sound.cpp scorched-cvs/src/sound/Sound.cpp
--- scorched/src/sound/Sound.cpp	2005-08-10 14:39:31.000000000 +0200
+++ scorched-cvs/src/sound/Sound.cpp	2005-09-18 11:59:33.000000000 +0200
@@ -86,6 +86,11 @@
 	instance_ = 0;
 }
 
+static char *checkString(char *x) 
+{
+	return (char *)(x?x:"null");
+}
+
 bool Sound::init(int channels)
 {
 	ALCdevice *soundDevice = alcOpenDevice(0);
@@ -113,16 +118,20 @@
 	alDistanceModel(AL_INVERSE_DISTANCE);
 
 	GLConsole::instance()->addLine(false, "AL_VENDOR:");
-	GLConsole::instance()->addLine(false, (char *) alGetString(AL_VENDOR));
+	GLConsole::instance()->addLine(false, 
+		checkString((char *) alGetString(AL_VENDOR)));
 	GLConsole::instance()->addLine(false, "AL_VERSION:");
-	GLConsole::instance()->addLine(false, (char *) alGetString(AL_VERSION));
+	GLConsole::instance()->addLine(false,
+		checkString((char *) alGetString(AL_VERSION)));
 	GLConsole::instance()->addLine(false, "AL_RENDERER:");
-	GLConsole::instance()->addLine(false, (char *) alGetString(AL_RENDERER));
+	GLConsole::instance()->addLine(false, 
+		checkString((char *) alGetString(AL_RENDERER)));
 	GLConsole::instance()->addLine(false, "AL_EXTENSIONS:");
-	GLConsole::instance()->addLine(false, (char *) alGetString(AL_EXTENSIONS));
+	GLConsole::instance()->addLine(false,
+		checkString((char *) alGetString(AL_EXTENSIONS)));
 	GLConsole::instance()->addLine(false, "ALC_DEVICE_SPECIFIER:");
-	GLConsole::instance()->addLine(false, (char *) 
-		alcGetString(soundDevice, ALC_DEVICE_SPECIFIER));
+	GLConsole::instance()->addLine(false,
+		checkString((char *) alcGetString(soundDevice, ALC_DEVICE_SPECIFIER)));
 
 	// Create all sound channels
 	for (int i=1; i<=OptionsDisplay::instance()->getSoundChannels(); i++)
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/sound/SoundBuffer.cpp scorched-cvs/src/sound/SoundBuffer.cpp
--- scorched/src/sound/SoundBuffer.cpp	2005-07-18 00:27:13.000000000 +0200
+++ scorched-cvs/src/sound/SoundBuffer.cpp	2005-09-18 11:59:33.000000000 +0200
@@ -55,7 +55,13 @@
 	ALsizei size;
 	ALsizei freq;
 	ALboolean loop;
+
+#ifdef __DARWIN__
+	alutLoadWAVFile((ALbyte*) wavFileName,&format,&data,&size,&freq);
+#else
 	alutLoadWAVFile((ALbyte*) wavFileName,&format,&data,&size,&freq,&loop);
+#endif
+
 	if ((error_ = alGetError()) != AL_NO_ERROR)
 	{
 		return false;
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/sprites/ExplosionNukeRenderer.cpp scorched-cvs/src/sprites/ExplosionNukeRenderer.cpp
--- scorched/src/sprites/ExplosionNukeRenderer.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched-cvs/src/sprites/ExplosionNukeRenderer.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -38,8 +38,8 @@
 	float width = RAND * 0.5f + 1.0f;
     
 	cloudRotation_ = RAND * 360.0f;
-	rotation_[0] = getFastSin(rot) * width;
-	rotation_[1] = getFastCos(rot) * width;
+	rotation_[0] = DefinesUtil::getFastSin(rot) * width;
+	rotation_[1] = DefinesUtil::getFastCos(rot) * width;
 }
 
 ExplosionNukeRendererEntry::~ExplosionNukeRendererEntry()
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/sprites/ExplosionTextures.cpp scorched-cvs/src/sprites/ExplosionTextures.cpp
--- scorched/src/sprites/ExplosionTextures.cpp	2004-11-22 22:30:40.000000000 +0100
+++ scorched-cvs/src/sprites/ExplosionTextures.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -194,7 +194,7 @@
 		}
 
 		const char *fileName = getDataFile(name);
-		if (fileExists(fileName))
+		if (DefinesUtil::fileExists(fileName))
 		{
 			GLBitmap *map = new GLBitmap;
 			if (map->loadFromFile(fileName, false))
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/tankgraph/MissileMesh.cpp scorched-cvs/src/tankgraph/MissileMesh.cpp
--- scorched/src/tankgraph/MissileMesh.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched-cvs/src/tankgraph/MissileMesh.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -103,11 +103,19 @@
 		Vector &fpos = (*flareItor);
 
         float newX = fpos[0];
-		float newY = (fpos[1] * getFastCos(angYZRad)) - (fpos[2] * getFastSin(angYZRad));
-		float newZ = (fpos[1] * getFastSin(angYZRad)) + (fpos[2] * getFastCos(angYZRad)); 
+		float newY = 
+			(fpos[1] * DefinesUtil::getFastCos(angYZRad)) - 
+			(fpos[2] * DefinesUtil::getFastSin(angYZRad));
+		float newZ = 
+			(fpos[1] * DefinesUtil::getFastSin(angYZRad)) + 
+			(fpos[2] * DefinesUtil::getFastCos(angYZRad)); 
 
-		float newX2 = (newX * getFastCos(angXYRad)) - (newY * getFastSin(angXYRad));
-		float newY2 = (newX * getFastSin(angXYRad)) + (newY * getFastCos(angXYRad)); 
+		float newX2 = 
+			(newX * DefinesUtil::getFastCos(angXYRad)) - 
+			(newY * DefinesUtil::getFastSin(angXYRad));
+		float newY2 = 
+			(newX * DefinesUtil::getFastSin(angXYRad)) + 
+			(newY * DefinesUtil::getFastCos(angXYRad)); 
 		float newZ2 = newZ;
 
 		Vector newPos;
diff -urN --exclude=CVS --exclude=Makefile --exclude=Makefile.in --exclude=autom4te.cache --exclude=aclocal.m4 --exclude=configure --exclude=config.status --exclude=borland --exclude=config.log --exclude=.deps scorched/src/weapons/WeaponTeleport.cpp scorched-cvs/src/weapons/WeaponTeleport.cpp
--- scorched/src/weapons/WeaponTeleport.cpp	2005-06-11 18:53:41.000000000 +0200
+++ scorched-cvs/src/weapons/WeaponTeleport.cpp	2005-09-22 17:14:28.000000000 +0200
@@ -65,8 +65,8 @@
 	bool found = false;
 	while (!found)
 	{
-		position[0] = RAND * 255.0f;
-		position[1] = RAND * 255.0f;
+		position[0] = RAND * 235.0f + 10.0f;
+		position[1] = RAND * 235.0f + 10.0f;
 		float height = context.landscapeMaps->getHMap().getInterpHeight(
 			position[0], position[1]);
 		if (height > allowedHeight) break;

scorched3d-formatstring.patch:

--- NEW FILE scorched3d-formatstring.patch ---
diff -ur scorched.orig/src/3dsparse/ModelID.cpp scorched/src/3dsparse/ModelID.cpp
--- scorched.orig/src/3dsparse/ModelID.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/3dsparse/ModelID.cpp	2006-02-11 15:21:36.000000000 +0100
@@ -77,7 +77,7 @@
 		static char meshName[1024];
 		snprintf(meshName, sizeof(meshName), "%s/%s", directory,
 			meshNameContent);
-		if (!DefinesUtil::fileExists(getDataFile(meshName)))
+		if (!DefinesUtil::fileExists(getDataFile("%s", meshName)))
 		{
 			dialogMessage("Scorched Models",
 						"Mesh file \"%s\"does not exist",
@@ -92,7 +92,7 @@
 		{
 			snprintf(skinName, sizeof(skinName), "%s/%s",
 				directory, skinNameContent);
-			if (!DefinesUtil::fileExists(getDataFile(skinName)))
+			if (!DefinesUtil::fileExists(getDataFile("%s", skinName)))
 			{
 				dialogMessage("Scorched Models",
 							"Skin file \"%s\" does not exist",
@@ -116,7 +116,7 @@
 		snprintf(meshName, sizeof(meshName), "%s/%s", directory,
 			meshNameContent);
 
-		if (!DefinesUtil::fileExists(getDataFile(meshName)))
+		if (!DefinesUtil::fileExists(getDataFile("%s", meshName)))
 		{
 			dialogMessage("Scorched Models",
 						"Mesh file \"%s\"does not exist",
Only in scorched/src/3dsparse: ModelID.cpp~
diff -ur scorched.orig/src/3dsparse/ModelStore.cpp scorched/src/3dsparse/ModelStore.cpp
--- scorched.orig/src/3dsparse/ModelStore.cpp	2005-04-12 00:19:08.000000000 +0200
+++ scorched/src/3dsparse/ModelStore.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -134,18 +134,18 @@
 	if (0 == strcmp(id.getType(), "ase"))
 	{
 		// Load the ASEFile containing the tank definitions
-		std::string meshName(getDataFile(id.getMeshName()));
+		std::string meshName(getDataFile("%s", id.getMeshName()));
 
 		bool noSkin = 
 			(0 == strcmp("none", id.getSkinName()));
 		ASEModelFactory factory;
 		model = factory.createModel(meshName.c_str(), 
-			(noSkin?"":getDataFile(id.getSkinName())));
+			(noSkin?"":getDataFile("%s", id.getSkinName())));
 	}
 	else
 	{
 		// Load the Milkshape containing the tank definitions
-		std::string meshName(getDataFile(id.getMeshName()));
+		std::string meshName(getDataFile("%s", id.getMeshName()));
 		MSModelFactory factory;
 		model = factory.createModel(meshName.c_str());		
 	}
diff -ur scorched.orig/src/3dsparse/aseFile.tab.cpp scorched/src/3dsparse/aseFile.tab.cpp
--- scorched.orig/src/3dsparse/aseFile.tab.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/3dsparse/aseFile.tab.cpp	2006-02-11 15:22:13.000000000 +0100
@@ -1057,7 +1057,7 @@
 {
 	char buffer[1024];
 	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, errmsg);
-	dialogMessage("Lexer", buffer);
+	dialogMessage("Lexer", "%s", buffer);
     return 0;
 }
 
@@ -1065,7 +1065,7 @@
 {
 	char buffer[1024];
 	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, warningmsg);
-	dialogMessage("Lexer", buffer);
+	dialogMessage("Lexer", "%s", buffer);
     return 0;
 }
 
@@ -1073,6 +1073,6 @@
 {
 	char buffer[1024];
 	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, debugmsg);
-	dialogMessage("Lexer", buffer);
+	dialogMessage("Lexer", "%s", buffer);
     return 0;
 }
Only in scorched/src/3dsparse: aseFile.tab.cpp~
diff -ur scorched.orig/src/GLEXT/GLConsole.cpp scorched/src/GLEXT/GLConsole.cpp
--- scorched.orig/src/GLEXT/GLConsole.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/GLEXT/GLConsole.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -53,7 +53,7 @@
 
 void GLConsole::logMessage(LoggerInfo &info)
 {
-	addLine(false, info.getMessage());
+	addLine(false, "%s", info.getMessage());
 }
 
 void GLConsole::keyboardCheck(const unsigned state, float frameTime, 
@@ -111,7 +111,7 @@
 								itor != matches.end();
 								itor++)
 							{
-								addLine(false, (*itor)->getName());
+								addLine(false, "%s", (*itor)->getName());
 							}
 						}
 					}
@@ -160,7 +160,7 @@
 			KeyboardKey *key = (*keyItor);
 			if (key->keyDown(buffer, keyState, false))
 			{
-				addLine(true, key->getName());
+				addLine(true, "%s", key->getName());
 			}
 		}
 	}
diff -ur scorched.orig/src/GLEXT/GLConsoleFileReader.cpp scorched/src/GLEXT/GLConsoleFileReader.cpp
--- scorched.orig/src/GLEXT/GLConsoleFileReader.cpp	2005-04-12 19:06:13.000000000 +0200
+++ scorched/src/GLEXT/GLConsoleFileReader.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -45,7 +45,7 @@
 		XMLNode *currentNode = (*childrenItor);		
 		if (strcmp(currentNode->getName(), "command")==0)
 		{
-			GLConsole::instance()->addLine(true, currentNode->getContent());
+			GLConsole::instance()->addLine(true, "%s", currentNode->getContent());
 		}
 	}
 	return true;
diff -ur scorched.orig/src/GLEXT/GLStateExtension.cpp scorched/src/GLEXT/GLStateExtension.cpp
--- scorched.orig/src/GLEXT/GLStateExtension.cpp	2004-09-09 20:03:49.000000000 +0200
+++ scorched/src/GLEXT/GLStateExtension.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -122,13 +122,13 @@
 // HACK for skin creator
 #ifdef dDOUBLE
 	GLConsole::instance()->addLine(false, "GL_VENDOR:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_VENDOR));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_VENDOR));
 	GLConsole::instance()->addLine(false, "GL_RENDERER:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_RENDERER));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_RENDERER));
 	GLConsole::instance()->addLine(false, "GL_VERSION:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_VERSION));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_VERSION));
 	GLConsole::instance()->addLine(false, "GL_EXTENSIONS:");
-	GLConsole::instance()->addLine(false, (const char *) glGetString(GL_EXTENSIONS));
+	GLConsole::instance()->addLine(false, "%s", (const char *) glGetString(GL_EXTENSIONS));
 	GLConsole::instance()->addLine(false, "TEXTURE_UNITS:");
 	GLConsole::instance()->addLine(false, "%s (%i units)", ((glActiveTextureARB_==0)?"Off":"On"),textureUnits_);
 	GLConsole::instance()->addLine(false, "VBO:");
diff -ur scorched.orig/src/GLW/GLWDropDown.cpp scorched/src/GLW/GLWDropDown.cpp
--- scorched.orig/src/GLW/GLWDropDown.cpp	2004-06-18 01:40:41.000000000 +0200
+++ scorched/src/GLW/GLWDropDown.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -122,7 +122,7 @@
 	GLWFont::instance()->getLargePtFont()->drawWidth(
 		(int) w_ - 25,
 		GLWFont::widgetFontColor, 14,
-		x_ + 5.0f, y_ + 5.0f, 0.0f, text_.c_str());
+		x_ + 5.0f, y_ + 5.0f, 0.0f, "%s", text_.c_str());
 }
 
 void GLWDropDown::buttonDown(unsigned int id)
diff -ur scorched.orig/src/GLW/GLWIcon.cpp scorched/src/GLW/GLWIcon.cpp
--- scorched.orig/src/GLW/GLWIcon.cpp	2004-09-10 14:45:45.000000000 +0200
+++ scorched/src/GLW/GLWIcon.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -72,9 +72,9 @@
 	if (bitmapNode && bitmapANode)
 	{
 		std::string bitmapName = 
-			getDataFile(bitmapNode->getContent());
+			getDataFile("%s", bitmapNode->getContent());
 		std::string bitmapAName = 
-			getDataFile(bitmapANode->getContent());
+			getDataFile("%s", bitmapANode->getContent());
 
 		texture_ = ModelStore::instance()->loadTexture(
 			bitmapName.c_str(), bitmapAName.c_str(), invert);
diff -ur scorched.orig/src/GLW/GLWLabel.cpp scorched/src/GLW/GLWLabel.cpp
--- scorched.orig/src/GLW/GLWLabel.cpp	2005-06-20 15:15:39.000000000 +0200
+++ scorched/src/GLW/GLWLabel.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -56,7 +56,7 @@
 void GLWLabel::calcWidth()
 {
 	if (w_ == 0.0f) w_ = (float) GLWFont::instance()->getLargePtFont()->getWidth(
-		size_, (char *) buttonText_.c_str());
+		size_, "%s", (char *) buttonText_.c_str());
 }
 
 void GLWLabel::draw()
@@ -67,5 +67,5 @@
 	calcWidth();
 	GLWFont::instance()->getLargePtFont()->draw(
 		color_, size_,
-		x_, y_ + 6.0f, 0.0f, (char *) buttonText_.c_str());
+		x_, y_ + 6.0f, 0.0f, "%s", (char *) buttonText_.c_str());
 }
diff -ur scorched.orig/src/GLW/GLWLoggerView.cpp scorched/src/GLW/GLWLoggerView.cpp
--- scorched.orig/src/GLW/GLWLoggerView.cpp	2005-07-11 22:40:38.000000000 +0200
+++ scorched/src/GLW/GLWLoggerView.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -133,14 +133,14 @@
 			{
 				// Figure texture width
 				float minus = GLWFont::instance()->getLargePtFont()->
-					getWidth(fontSize_, entry.info.getMessage()) / 2.0f;
+					getWidth(fontSize_, "%s", entry.info.getMessage()) / 2.0f;
 				float x = x_ + w_ / 2.0f - minus - 1;
 				float y = start - i * lineDepth_ - 1;
 
 				// Draw outline
  				GLWFont::instance()->getSmallPtFontOutline()->
  					drawOutline(black, outlineFontSize_, fontSize_,
- 						x, y, 0.0f, 
+ 						x, y, 0.0f, "%s",
  						entry.info.getMessage());
 			}
 			else
@@ -153,15 +153,15 @@
 				float x = x_ + w_ / 2.0f;
 				float y = start - i * lineDepth_;
 				float minusSource = (float) GLWFont::instance()->getLargePtFont()->
-					getWidth(fontSize_, source->getName());
+					getWidth(fontSize_, "%s", source->getName());
 
  				GLWFont::instance()->getSmallPtFontOutline()->
  					drawOutline(black, outlineFontSize_, fontSize_,
- 						x - minusSource - outlineFontSize_ / 2.0f - 2.0f, y, 0.0f, 
+ 						x - minusSource - outlineFontSize_ / 2.0f - 2.0f, y, 0.0f, "%s",
 						source->getName());
  				GLWFont::instance()->getSmallPtFontOutline()->
  					drawOutline(black, outlineFontSize_, fontSize_,
- 						x + outlineFontSize_ / 2.0f + 2.0f, y, 0.0f, 
+ 						x + outlineFontSize_ / 2.0f + 2.0f, y, 0.0f, "%s",
 						dest->getName());
 			}
 
@@ -180,7 +180,7 @@
 			{
 				// Figure texture width
 				float minus = GLWFont::instance()->getLargePtFont()->
-					getWidth(fontSize_, entry.info.getMessage()) / 2.0f;
+					getWidth(fontSize_, "%s", entry.info.getMessage()) / 2.0f;
 				float x = x_ + w_ / 2.0f  - minus;
 				float y = start - i * lineDepth_;
 
@@ -220,19 +220,19 @@
 					GLWFont::instance()->getLargePtFont()->
 						drawSubStr(0, entry.info.getInfoLen(),
 							source?source->getColor():dColor, fontSize_,
-							x, y, 0.0f, 
+							x, y, 0.0f, "%s",
 							entry.info.getMessage());
 					GLWFont::instance()->getLargePtFont()->
 						drawSubStr(entry.info.getInfoLen(), entry.info.getMessageLen(),
 							dColor, fontSize_,
-							x, y, 0.0f, 
+							x, y, 0.0f, "%s",
 							entry.info.getMessage());
 				}
 				else
 				{
 					GLWFont::instance()->getLargePtFont()->
 						draw(dColor, fontSize_,
-							x, y, 0.0f, 
+							x, y, 0.0f, "%s",
 							entry.info.getMessage());
 				}
 			}
@@ -246,16 +246,16 @@
 				float x = x_ + w_ / 2.0f;
 				float y = start - i * lineDepth_;
 				float minusSource = (float) GLWFont::instance()->getLargePtFont()->
-					getWidth(fontSize_, source->getName());
+					getWidth(fontSize_, "%s", source->getName());
 
 				GLWFont::instance()->getLargePtFont()->
 					draw(source?source->getColor():defaultColor, fontSize_,
 						x - minusSource - outlineFontSize_ / 2.0f - 4.0f, y, 0.0f, 
-						source->getName());
+						"%s", source->getName());
 				GLWFont::instance()->getLargePtFont()->
 					draw(dest?dest->getColor():defaultColor, fontSize_,
 						x + outlineFontSize_ / 2.0f + 4.0f, y, 0.0f, 
-						dest->getName());
+						"%s", dest->getName());
 
 				if (entry.info.getIcon())
 				{
diff -ur scorched.orig/src/GLW/GLWScorchedInfo.cpp scorched/src/GLW/GLWScorchedInfo.cpp
--- scorched.orig/src/GLW/GLWScorchedInfo.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/GLW/GLWScorchedInfo.cpp	2006-02-11 15:23:34.000000000 +0100
@@ -92,12 +92,12 @@
 			}
 			float windwidth = (float) GLWFont::instance()->
 				getSmallPtFont()->getWidth(
-				fontSize_, buffer);
+				fontSize_, "%s", buffer);
 			float offSet = 0.0f;
 			if (!noCenter_) offSet = w_ / 2.0f - (windwidth / 2.0f);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				*fontColor, fontSize_,
-				x_ + offSet, y_, 0.0f,
+				x_ + offSet, y_, 0.0f, "%s",
 				buffer);                    
 		}
 		break;
@@ -125,12 +125,12 @@
 		{
 			setToolTip(&model->getTips()->nameTip);
 			float namewidth = (float) GLWFont::instance()->getSmallPtFont()->getWidth(
-				fontSize_, current->getName());
+				fontSize_, "%s", current->getName());
 			float offSet = 0.0f;
 			if (!noCenter_) offSet = w_ / 2.0f - (namewidth / 2.0f);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				current->getColor(), fontSize_,
-				x_ + offSet, y_, 0.0f,
+				x_ + offSet, y_, 0.0f, "%s",
 				current->getName());
 		}
 		break;
@@ -157,7 +157,7 @@
 			setToolTip(&model->getTips()->nameTip);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				current->getColor(), fontSize_,
-				x_, y_, 0.0f,
+				x_, y_, 0.0f, "%s",
 				current->getScore().getStatsRank());
 		}
 		break;
@@ -165,7 +165,7 @@
 			setToolTip(&model->getTips()->autodTip);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				*fontColor, fontSize_,
-				x_, y_, 0.0f,
+				x_, y_, 0.0f, "%s",
 				(current->getAccessories().getAutoDefense().haveDefense()?"On":"Off"));
 		break;
 		case eParachuteCount:
@@ -240,13 +240,13 @@
 			snprintf(buffer, sizeof(buffer), "%s",
 				current->getAccessories().getWeapons().getCurrent()->getName());
 			float weaponWidth = (float) GLWFont::instance()->getSmallPtFont()->
-				getWidth(fontSize_, buffer);
+				getWidth(fontSize_, "%s", buffer);
 
 			float offSet = 0.0f;
 			if (!noCenter_) offSet = w_ / 2.0f - (weaponWidth / 2.0f);
 			GLWFont::instance()->getSmallPtFont()->draw(
 				*fontColor, fontSize_,
-				x_ + offSet, y_, 0.0f,
+				x_ + offSet, y_, 0.0f, "%s",
 				buffer);
 		}
 		break;
Only in scorched/src/GLW: GLWScorchedInfo.cpp~
diff -ur scorched.orig/src/GLW/GLWSelectorPart.cpp scorched/src/GLW/GLWSelectorPart.cpp
--- scorched.orig/src/GLW/GLWSelectorPart.cpp	2004-12-27 17:53:10.000000000 +0100
+++ scorched/src/GLW/GLWSelectorPart.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -62,7 +62,7 @@
 
 		// Get width
 		float currentwidth = 
-			(float) font.getWidth(12, (char *) item.getText()) + 20.0f;
+			(float) font.getWidth(12, "%s", (char *) item.getText()) + 20.0f;
 		if (item.getSelected()) selected_ = true;
 		if (item.getIcon()) icon_ = true;
 		if (currentwidth > selectedWidth) selectedWidth = currentwidth;
@@ -196,7 +196,7 @@
 					currentTop - 16.0f, 0.0f, "x");
 			}
 			font.draw(*c, 12, selectedX_ + selectedIndent_ + 10.0f, 
-				currentTop - 16.0f, 0.0f, (char *) item.getText());
+				currentTop - 16.0f, 0.0f, "%s", (char *) item.getText());
 			currentTop -= 18.0f;
 		}
 	}
Only in scorched/src/GLW: GLWSelectorPart.cpp.orig
diff -ur scorched.orig/src/GLW/GLWToolTip.cpp scorched/src/GLW/GLWToolTip.cpp
--- scorched.orig/src/GLW/GLWToolTip.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/GLW/GLWToolTip.cpp	2006-02-11 15:20:24.000000000 +0100
@@ -39,7 +39,7 @@
 GLWTip::GLWTip(const char *tit, const char *tex) 
 	: id_(++nextId_), x(0), y(0), w(0), h(0), handler_(0)
 {
-	setText(tit, tex);
+	setText(tit, "%s", tex);
 }
 
 GLWTip::~GLWTip()
@@ -84,12 +84,12 @@
 	for (itor = texts.begin(); itor != enditor; itor++)
 	{
 		float width = float(GLWFont::instance()->getSmallPtFont()->
-			getWidth(9,(*itor))) + 10.0f;
+			getWidth(9, "%s", (*itor))) + 10.0f;
 		if (width > textWidth_) textWidth_ = width;
 	}
 
 	float width = float(GLWFont::instance()->getSmallPtFont()->
-		getWidth(11,title_.c_str())) + 10.0f; 
+		getWidth(11, "%s", title_.c_str())) + 10.0f; 
 	if (width > textWidth_) textWidth_ = width;
 }
 
@@ -262,7 +262,7 @@
 
 	float pos = posY + posH - 16.0f;
 	GLWFont::instance()->getSmallPtFont()->drawA(selectedColor, alpha, 11, posX + 3.0f, 
-		pos, 0.0f, lastTip_->getTitle());
+		pos, 0.0f, "%s", lastTip_->getTitle());
 	pos -= 2.0f;
 
 	std::list &texts = lastTip_->getTexts();
@@ -273,6 +273,6 @@
 		pos -= 10.0f;
 
 		GLWFont::instance()->getSmallPtFont()->drawA(color, alpha, 9, posX + 6.0f, 
-			pos, 0.0f, (*itor));
+			pos, 0.0f, "%s", (*itor));
 	}
 }
Only in scorched/src/GLW: GLWToolTip.cpp~
diff -ur scorched.orig/src/GLW/GLWWindow.cpp scorched/src/GLW/GLWWindow.cpp
--- scorched.orig/src/GLW/GLWWindow.cpp	2005-06-13 10:24:36.000000000 +0200
+++ scorched/src/GLW/GLWWindow.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -457,7 +457,7 @@
 
 	// Desc
 	if (!node->getNamedChild("description", description_)) return false;
-	toolTip_.setText(name_.c_str(), description_.c_str());
+	toolTip_.setText(name_.c_str(), "%s", description_.c_str());
 
 	// Disabled
 	XMLNode *disabled = 0;
diff -ur scorched.orig/src/actions/Lightning.cpp scorched/src/actions/Lightning.cpp
--- scorched.orig/src/actions/Lightning.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/actions/Lightning.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -92,7 +92,7 @@
 			{
 				SoundBuffer *expSound =
 					Sound::instance()->fetchOrCreateBuffer(
-					(char *) getDataFile(weapon_->getSound()));
+					(char *) getDataFile("%s", weapon_->getSound()));
 				SoundUtils::playAbsoluteSound(VirtualSoundPriority::eAction,
 					expSound, position_);
 			}
diff -ur scorched.orig/src/actions/SoundAction.cpp scorched/src/actions/SoundAction.cpp
--- scorched.orig/src/actions/SoundAction.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/actions/SoundAction.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -45,7 +45,7 @@
 	{
 		SoundBuffer *activateSound = 
 			Sound::instance()->fetchOrCreateBuffer((char *)
-				getDataFile(weapon_->getSound()));
+				getDataFile("%s", weapon_->getSound()));
 		SoundUtils::playRelativeSound(VirtualSoundPriority::eAction,
 			activateSound);
 	}
diff -ur scorched.orig/src/actions/TankSay.cpp scorched/src/actions/TankSay.cpp
--- scorched.orig/src/actions/TankSay.cpp	2005-07-11 22:40:38.000000000 +0200
+++ scorched/src/actions/TankSay.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -70,7 +70,7 @@
 		}
 		else if (OptionsParam::instance()->getDedicatedServer())
 		{
-			Logger::log(text_.c_str());
+			Logger::log("%s", text_.c_str());
 		}
 	}
 }
diff -ur scorched.orig/src/actions/Teleport.cpp scorched/src/actions/Teleport.cpp
--- scorched.orig/src/actions/Teleport.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/actions/Teleport.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -77,7 +77,7 @@
 			{
 				SoundBuffer *activateSound = 
 					Sound::instance()->fetchOrCreateBuffer((char *)
-						getDataFile(weapon_->getSound()));
+						getDataFile("%s", weapon_->getSound()));
 				SoundUtils::playAbsoluteSound(VirtualSoundPriority::eAction,
 					activateSound, tank->getPhysics().getTankPosition());
 			}
diff -ur scorched.orig/src/boids/BoidWorld.cpp scorched/src/boids/BoidWorld.cpp
--- scorched.orig/src/boids/BoidWorld.cpp	2005-08-09 17:39:32.000000000 +0200
+++ scorched/src/boids/BoidWorld.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -123,7 +123,7 @@
 		const char *sound = (*itor).c_str();
 		SoundBuffer *buffer =
 			Sound::instance()->fetchOrCreateBuffer(
-				(char *) getDataFile(sound));
+				(char *) getDataFile("%s", sound));
 		sounds_.push_back(buffer);
 	}
 }
diff -ur scorched.orig/src/client/ClientMain.cpp scorched/src/client/ClientMain.cpp
--- scorched.orig/src/client/ClientMain.cpp	2005-07-19 23:45:36.000000000 +0200
+++ scorched/src/client/ClientMain.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -175,7 +175,8 @@
 	std::string errorString;
 	if (!GLConsoleFileReader::loadFileIntoConsole(getDataFile("data/autoexec.xml"), errorString))
 	{
-		dialogMessage("Failed to parse data/autoexec.xml", errorString.c_str());
+		dialogMessage("Failed to parse data/autoexec.xml", "%s",
+			errorString.c_str());
 		return false;
 	}
 	return true;
diff -ur scorched.orig/src/client/ClientTextHandler.cpp scorched/src/client/ClientTextHandler.cpp
--- scorched.orig/src/client/ClientTextHandler.cpp	2005-07-11 22:40:39.000000000 +0200
+++ scorched/src/client/ClientTextHandler.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -65,7 +65,7 @@
 		MessageDisplay::instance()->clear();
 		MessageDisplay::instance()->addMessage(message.getText());
 
-		Logger::log(message.getText());
+		Logger::log("%s", message.getText());
 	}
 	else
 	{
diff -ur scorched.orig/src/client/MessageDisplay.cpp scorched/src/client/MessageDisplay.cpp
--- scorched.orig/src/client/MessageDisplay.cpp	2005-08-16 22:23:59.000000000 +0200
+++ scorched/src/client/MessageDisplay.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -62,7 +62,7 @@
 			if (currentText_.size())
 			{
 				GLConsole::instance()->addLine(
-					false, currentText_.c_str());
+					false, "%s", currentText_.c_str());
 			}
 			currentText_ = texts_.front();
 			texts_.pop_front();
@@ -86,7 +86,7 @@
 	float wHeight = (float) GLViewPort::getHeight();
 	float wWidth = (float) GLViewPort::getWidth();
 	float textWidth = float(GLWFont::instance()->getLargePtFont()->getWidth(
-		30, currentText_.c_str()));
+		30, "%s", currentText_.c_str()));
 
 	float x = (wWidth/2.0f) - (textWidth / 2) - 10.0f;
 	float y = wHeight - 60.0f;
@@ -100,6 +100,6 @@
 	Vector white(0.9f, 0.9f, 1.0f);
 	GLWFont::instance()->getLargePtFont()->draw(
 		white, 30, 
-		x + 10.0f, y + 7.0f, 0.0f,
+		x + 10.0f, y + 7.0f, 0.0f,"%s",
 		currentText_.c_str());
 }
diff -ur scorched.orig/src/client/SpeedChange.cpp scorched/src/client/SpeedChange.cpp
--- scorched.orig/src/client/SpeedChange.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/client/SpeedChange.cpp	2006-02-11 15:23:32.000000000 +0100
@@ -61,7 +61,7 @@
 		snprintf(buffer, sizeof(buffer), "%.1fX", speed);
 
 		static Vector fontColor(0.7f, 0.7f, 0.2f);
-		GLWFont::instance()->getLargePtFont()->draw(fontColor, 20, 10.0f, 10.0f, 0.0f, buffer);
+		GLWFont::instance()->getLargePtFont()->draw(fontColor, 20, 10.0f, 10.0f, 0.0f, "%s", buffer);
 	}
 }
 
Only in scorched/src/client: SpeedChange.cpp~
diff -ur scorched.orig/src/client/TargetCamera.cpp scorched/src/client/TargetCamera.cpp
--- scorched.orig/src/client/TargetCamera.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/client/TargetCamera.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -149,7 +149,7 @@
 		for (int i=0; iaddLine(info.getMessage());
+	listView_->addLine("%s", info.getMessage());
 }
 
 void LogDialog::draw()
diff -ur scorched.orig/src/dialogs/ProgressDialog.cpp scorched/src/dialogs/ProgressDialog.cpp
--- scorched.orig/src/dialogs/ProgressDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/dialogs/ProgressDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -127,7 +127,7 @@
 
 			Vector color(0.2f, 0.2f, 0.2f);
 			GLWFont::instance()->getLargePtFont()->draw(color, 
-				14.0f, 20.0f, 33.0f, 0.0f, 
+				14.0f, 20.0f, 33.0f, 0.0f, "%s",
 				progressLabel_->getText());
 
 			HelpButtonDialog::instance()->getHelpTexture().draw();
@@ -148,10 +148,10 @@
 
 			Vector color2(0.4f, 0.4f, 0.4f);
 			GLWFont::instance()->getLargePtFont()->drawWidth(380, 
-				color2, 10.0f, 44.0f, 3.0f, 0.0f, 
+				color2, 10.0f, 44.0f, 3.0f, 0.0f, "%s",
 				tip1_.c_str());
 			GLWFont::instance()->getLargePtFont()->drawWidth(380, 
-				color2, 10.0f, 44.0f, -12.0f, 0.0f, 
+				color2, 10.0f, 44.0f, -12.0f, 0.0f, "%s",
 				tip2_.c_str());
 		glPopMatrix();
 	}
diff -ur scorched.orig/src/dialogs/RulesDialog.cpp scorched/src/dialogs/RulesDialog.cpp
--- scorched.orig/src/dialogs/RulesDialog.cpp	2005-06-27 02:55:48.000000000 +0200
+++ scorched/src/dialogs/RulesDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -74,7 +74,7 @@
 		while (found)
 		{
 			*found = '\0';
-			listView_->addLine(start);
+			listView_->addLine("%s", start);
 			start = found;
 			start++;
 
@@ -82,12 +82,12 @@
 		}
 		if (start[0] != '\0')
 		{
-			listView_->addLine(start);
+			listView_->addLine("%s", start);
 		}
 	}
 	else
 	{
-		listView_->addLine(text);
+		listView_->addLine("%s", text);
 	}
 }
 
diff -ur scorched.orig/src/dialogs/SaveDialog.cpp scorched/src/dialogs/SaveDialog.cpp
--- scorched.orig/src/dialogs/SaveDialog.cpp	2005-08-17 14:53:13.000000000 +0200
+++ scorched/src/dialogs/SaveDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -87,7 +87,7 @@
 		if (textBox_->getText()[0])
 		{
 			std::string saveFile = formatString("%s.s3d", textBox_->getText().c_str());
-			if (ClientSave::saveClient(getSaveFile(saveFile.c_str())))
+			if (ClientSave::saveClient(getSaveFile("%s", saveFile.c_str())))
 			{
 				Logger::log(LoggerInfo(LoggerInfo::TypePerformance,
 					formatString("Saved as \"%s\"", saveFile.c_str())));
diff -ur scorched.orig/src/dialogs/ScoreDialog.cpp scorched/src/dialogs/ScoreDialog.cpp
--- scorched.orig/src/dialogs/ScoreDialog.cpp	2005-06-02 01:09:32.000000000 +0200
+++ scorched/src/dialogs/ScoreDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -137,7 +137,7 @@
 			405,
 			white,
 			20,
-			x_ + 8.0f, y_ + h_ - 21.0f, 0.0f,
+			x_ + 8.0f, y_ + h_ - 21.0f, 0.0f, "%s",
 			ScorchedClient::instance()->getOptionsGame().getServerName());
 	}
 	else
@@ -165,11 +165,11 @@
 				moves);
 
 		int roundsWidth = GLWFont::instance()->getSmallPtFont()->getWidth(
-			10, rounds);
+			10, "%s", rounds);
 		GLWFont::instance()->getSmallPtFont()->draw(
 			white,
 			10,
-			x_ + 430 - roundsWidth, y_ + h_ - 40.0f, 0.0f,
+			x_ + 430 - roundsWidth, y_ + h_ - 40.0f, 0.0f, "%s",
 			rounds);
 	}
 
@@ -373,7 +373,7 @@
 		GLWFont::instance()->getSmallPtFont()->draw(
 			current->getColor(),
 			10,
-			textX + nameLeft, textY, 0.0f,
+			textX + nameLeft, textY, 0.0f, "%s",
 			name);
 		GLWFont::instance()->getSmallPtFont()->draw(
 			current->getColor(),
diff -ur scorched.orig/src/engine/ModFiles.cpp scorched/src/engine/ModFiles.cpp
--- scorched.orig/src/engine/ModFiles.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/engine/ModFiles.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -82,7 +82,7 @@
 {
 	{
 		// Get and check the user mod directory exists
-		const char *modDir = getModFile(mod);
+		const char *modDir = getModFile("%s", mod);
 		if (DefinesUtil::dirExists(modDir))
 		{
 			if (!loadModDir(modDir, mod)) return false;
@@ -95,7 +95,7 @@
 
 	{
 		// Get and check global mod directory
-		const char *modDir = getGlobalModFile(mod);
+		const char *modDir = getGlobalModFile("%s", mod);
 		if (DefinesUtil::dirExists(modDir))
 		{
 			if (!loadModDir(modDir, mod)) return false;
@@ -135,8 +135,8 @@
 			dialogMessage("Mod",
 				"Failed to find \"%s\" mod files in directories \"%s\" \"%s\"",
 				mod,
-				getModFile(mod),
-				getGlobalModFile(mod));
+				getModFile("%s", mod),
+				getGlobalModFile("%s", mod));
 			return false;
 		}
 	}
@@ -217,7 +217,7 @@
 
 bool ModFiles::writeModFiles(const char *mod)
 {
-	const char *modDir = getModFile(mod);
+	const char *modDir = getModFile("%s", mod);
 	if (!DefinesUtil::dirExists(modDir))
 	{
 		DefinesUtil::dirMake(modDir);
diff -ur scorched.orig/src/landscape/HeightMapLoader.cpp scorched/src/landscape/HeightMapLoader.cpp
--- scorched.orig/src/landscape/HeightMapLoader.cpp	2004-11-13 13:39:53.000000000 +0100
+++ scorched/src/landscape/HeightMapLoader.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -110,7 +110,7 @@
 		// Load the landscape
 		levelSurround = file->levelsurround;
 		GLBitmap bitmap;
-		const char *fileName = getDataFile(file->file.c_str());
+		const char *fileName = getDataFile("%s", file->file.c_str());
 		if (!bitmap.loadFromFile(fileName, false))
 		{
 			dialogMessage("HeightMapLoader",
diff -ur scorched.orig/src/landscape/HeightMapModifier.cpp scorched/src/landscape/HeightMapModifier.cpp
--- scorched.orig/src/landscape/HeightMapModifier.cpp	2005-08-15 12:22:29.000000000 +0200
+++ scorched/src/landscape/HeightMapModifier.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -185,7 +185,7 @@
 	// Check if we need to load a new mask
 	if (!defn.mask.empty())
 	{
-		const char *fileName = getDataFile(defn.mask.c_str());
+		const char *fileName = getDataFile("%s", defn.mask.c_str());
 		if (!maskMap.loadFromFile(fileName, false))
 		{
 			dialogExit("Landscape",
diff -ur scorched.orig/src/landscape/Landscape.cpp scorched/src/landscape/Landscape.cpp
--- scorched.orig/src/landscape/Landscape.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/landscape/Landscape.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -202,15 +202,15 @@
 		LandscapeTexTextureGenerate *generate = 
 			(LandscapeTexTextureGenerate *) tex->texture;
 
-		GLBitmap texture0(getDataFile(generate->texture0.c_str()));
-		GLBitmap texture1(getDataFile(generate->texture1.c_str()));
-		GLBitmap texture2(getDataFile(generate->texture2.c_str()));
-		GLBitmap texture3(getDataFile(generate->texture3.c_str()));
-		GLBitmap texture4(getDataFile(generate->texture4.c_str()));
-		GLBitmap bitmapShore(getDataFile(generate->shore.c_str()));
-		GLBitmap bitmapRock(getDataFile(generate->rockside.c_str()));
-		GLBitmap bitmapRoof(getDataFile(generate->roof.c_str()));
-		GLBitmap bitmapSurround(getDataFile(generate->surround.c_str()));
+		GLBitmap texture0(getDataFile("%s", generate->texture0.c_str()));
+		GLBitmap texture1(getDataFile("%s", generate->texture1.c_str()));
+		GLBitmap texture2(getDataFile("%s", generate->texture2.c_str()));
+		GLBitmap texture3(getDataFile("%s", generate->texture3.c_str()));
+		GLBitmap texture4(getDataFile("%s", generate->texture4.c_str()));
+		GLBitmap bitmapShore(getDataFile("%s", generate->shore.c_str()));
+		GLBitmap bitmapRock(getDataFile("%s", generate->rockside.c_str()));
+		GLBitmap bitmapRoof(getDataFile("%s", generate->roof.c_str()));
+		GLBitmap bitmapSurround(getDataFile("%s", generate->surround.c_str()));
 		GLBitmap *bitmaps[5];
 		bitmaps[0] = &texture0;
 		bitmaps[1] = &texture1;
@@ -268,26 +268,26 @@
 	// Generate the scorch map for the landscape
 	std::string sprayMaskFile = getDataFile("data/textures/smoke01.bmp");
 	GLBitmap sprayMaskBitmap(sprayMaskFile.c_str(), sprayMaskFile.c_str(), false);
-	scorchMap_.loadFromFile(getDataFile(tex->scorch.c_str()));
-	GLBitmap scorchMap(getDataFile(tex->scorch.c_str()));
+	scorchMap_.loadFromFile(getDataFile("%s", tex->scorch.c_str()));
+	GLBitmap scorchMap(getDataFile("%s", tex->scorch.c_str()));
 	scorchMap.resize(sprayMaskBitmap.getWidth(), sprayMaskBitmap.getHeight());
 	GLBitmap texture1New(sprayMaskBitmap.getWidth(), sprayMaskBitmap.getHeight(), true);
 	GLBitmapModifier::makeBitmapTransparent(texture1New, scorchMap, sprayMaskBitmap);
 	landTex1_.replace(texture1New, GL_RGBA);
 
 	// Magma
-	GLBitmap bitmapMagma(getDataFile(tex->magmasmall.c_str()));
+	GLBitmap bitmapMagma(getDataFile("%s", tex->magmasmall.c_str()));
 	DIALOG_ASSERT(magTexture_.replace(bitmapMagma));
 
 	// Sky
-	std::string ctex(getDataFile(tex->skytexture.c_str()));
-	std::string ctexm(getDataFile(tex->skytexturemask.c_str()));
+	std::string ctex(getDataFile("%s", tex->skytexture.c_str()));
+	std::string ctexm(getDataFile("%s", tex->skytexturemask.c_str()));
 	GLBitmap bitmapCloud(ctex.c_str(), ctexm.c_str(), false);
 	DIALOG_ASSERT(cloudTexture_.replace(bitmapCloud, GL_RGBA));
-	skyColorsMap_.loadFromFile(getDataFile(tex->skycolormap.c_str()));
+	skyColorsMap_.loadFromFile(getDataFile("%s", tex->skycolormap.c_str()));
 
 	// Detail
-	GLBitmap bitmapDetail(getDataFile(tex->detail.c_str()));
+	GLBitmap bitmapDetail(getDataFile("%s", tex->detail.c_str()));
 	DIALOG_ASSERT(detailTexture_.replace(bitmapDetail, GL_RGB, true));
 
 	// Create the plan textures (for the plan and wind dialogs)
diff -ur scorched.orig/src/landscape/LandscapeDefn.cpp scorched/src/landscape/LandscapeDefn.cpp
--- scorched.orig/src/landscape/LandscapeDefn.cpp	2005-01-17 22:39:35.000000000 +0100
+++ scorched/src/landscape/LandscapeDefn.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -104,7 +104,7 @@
 		startmask)) return false;
 	if (!startmask.empty())
 	{
-		if (!checkDataFile(startmask.c_str())) return false;
+		if (!checkDataFile("%s", startmask.c_str())) return false;
 	}
 	return node->failChildren();
 }
@@ -113,7 +113,7 @@
 {
 	if (!node->getNamedChild("file", file)) return false;
 	if (!node->getNamedChild("levelsurround", levelsurround)) return false;
-	if (!checkDataFile(file.c_str())) return false;
+	if (!checkDataFile("%s", file.c_str())) return false;
 	return node->failChildren();
 }
 
@@ -137,7 +137,7 @@
 
 	if (!mask.empty())
 	{
-		if (!checkDataFile(mask.c_str())) return false;
+		if (!checkDataFile("%s", mask.c_str())) return false;
 	}
 	return node->failChildren();
 }
diff -ur scorched.orig/src/landscape/LandscapeObjectsPlacement.cpp scorched/src/landscape/LandscapeObjectsPlacement.cpp
--- scorched.orig/src/landscape/LandscapeObjectsPlacement.cpp	2005-07-18 00:27:13.000000000 +0200
+++ scorched/src/landscape/LandscapeObjectsPlacement.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -298,7 +298,7 @@
 			placement.objecttype.c_str());
 	}
 
-	GLBitmap map(getDataFile(placement.mask.c_str()));
+	GLBitmap map(getDataFile("%s", placement.mask.c_str()));
 	if (!map.getBits())
 	{
 		dialogExit("LandscapeObjectPlacementMask",
diff -ur scorched.orig/src/landscape/LandscapeSoundManager.cpp scorched/src/landscape/LandscapeSoundManager.cpp
--- scorched.orig/src/landscape/LandscapeSoundManager.cpp	2005-07-13 14:51:49.000000000 +0200
+++ scorched/src/landscape/LandscapeSoundManager.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -67,7 +67,7 @@
 			entry.soundType = (*typeItor);
 			entry.soundBuffer = 
 				Sound::instance()->fetchOrCreateBuffer((char *)
-					getDataFile(entry.soundType->sound.c_str()));
+					getDataFile("%s", entry.soundType->sound.c_str()));
 			entry.timeLeft = entry.soundType->timing->getNextEventTime();
 			entry.soundSource = new VirtualSoundSource(
 				VirtualSoundPriority::eEnvironment, (entry.timeLeft < 0.0f), false);
diff -ur scorched.orig/src/landscape/LandscapeTex.cpp scorched/src/landscape/LandscapeTex.cpp
--- scorched.orig/src/landscape/LandscapeTex.cpp	2005-08-02 19:27:44.000000000 +0200
+++ scorched/src/landscape/LandscapeTex.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -164,7 +164,7 @@
 	if (!soundsNode->getNamedChild("volume", soundvolume)) return false;
 	while (soundsNode->getNamedChild("sound", sound, false))
 	{
-		if (!checkDataFile(sound.c_str())) return false;
+		if (!checkDataFile("%s", sound.c_str())) return false;
 		sounds.push_back(sound);
 	}
 	if (!soundsNode->failChildren()) return false;
@@ -181,10 +181,10 @@
 	if (!node->getNamedChild("wavetexture1", wavetexture1)) return false;
 	if (!node->getNamedChild("wavetexture2", wavetexture2)) return false;
 	if (!node->getNamedChild("height", height)) return false;
-	if (!checkDataFile(reflection.c_str())) return false;
-	if (!checkDataFile(texture.c_str())) return false;
-	if (!checkDataFile(wavetexture1.c_str())) return false;
-	if (!checkDataFile(wavetexture2.c_str())) return false;
+	if (!checkDataFile("%s", reflection.c_str())) return false;
+	if (!checkDataFile("%s", texture.c_str())) return false;
+	if (!checkDataFile("%s", wavetexture1.c_str())) return false;
+	if (!checkDataFile("%s", wavetexture2.c_str())) return false;
 	return node->failChildren();
 }
 
@@ -200,15 +200,15 @@
 	if (!node->getNamedChild("texture2", texture2)) return false;
 	if (!node->getNamedChild("texture3", texture3)) return false;
 	if (!node->getNamedChild("texture4", texture4)) return false;
-	if (!checkDataFile(surround.c_str())) return false;
-	if (!checkDataFile(roof.c_str())) return false;
-	if (!checkDataFile(rockside.c_str())) return false;
-	if (!checkDataFile(shore.c_str())) return false;
-	if (!checkDataFile(texture0.c_str())) return false;
-	if (!checkDataFile(texture1.c_str())) return false;
-	if (!checkDataFile(texture2.c_str())) return false;
-	if (!checkDataFile(texture3.c_str())) return false;
-	if (!checkDataFile(texture4.c_str())) return false;
+	if (!checkDataFile("%s", surround.c_str())) return false;
+	if (!checkDataFile("%s", roof.c_str())) return false;
+	if (!checkDataFile("%s", rockside.c_str())) return false;
+	if (!checkDataFile("%s", shore.c_str())) return false;
+	if (!checkDataFile("%s", texture0.c_str())) return false;
+	if (!checkDataFile("%s", texture1.c_str())) return false;
+	if (!checkDataFile("%s", texture2.c_str())) return false;
+	if (!checkDataFile("%s", texture3.c_str())) return false;
+	if (!checkDataFile("%s", texture4.c_str())) return false;
 	return node->failChildren();
 }
 
@@ -253,12 +253,12 @@
 	if (!node->getNamedChild("skydiffuse", skydiffuse)) return false;
 	if (!node->getNamedChild("skyambience", skyambience)) return false;
 
-	if (!checkDataFile(detail.c_str())) return false;
-	if (!checkDataFile(magmasmall.c_str())) return false;
-	if (!checkDataFile(scorch.c_str())) return false;
-	if (!checkDataFile(skytexture.c_str())) return false;
-	if (!checkDataFile(skytexturemask.c_str())) return false;
-	if (!checkDataFile(skycolormap.c_str())) return false;
+	if (!checkDataFile("%s", detail.c_str())) return false;
+	if (!checkDataFile("%s", magmasmall.c_str())) return false;
+	if (!checkDataFile("%s", scorch.c_str())) return false;
+	if (!checkDataFile("%s", skytexture.c_str())) return false;
+	if (!checkDataFile("%s", skytexturemask.c_str())) return false;
+	if (!checkDataFile("%s", skycolormap.c_str())) return false;
 
 	{
 		XMLNode *placementsNode;
diff -ur scorched.orig/src/landscape/Water.cpp scorched/src/landscape/Water.cpp
--- scorched.orig/src/landscape/Water.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/landscape/Water.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -113,23 +113,23 @@
 		height_ = water->height;
 
 		waterOn_ = true;
-		const char *wave1 = getDataFile(
+		const char *wave1 = getDataFile("%s",
 			water->wavetexture1.c_str());
 		GLBitmap waves1Map(wave1, wave1, false);
-		const char *wave2 = getDataFile(
+		const char *wave2 = getDataFile("%s",
 			water->wavetexture2.c_str());
 		GLBitmap waves2Map(wave2, wave2, false);
 		wWaves_.getWavesTexture1().replace(waves1Map, GL_RGBA);
 		wWaves_.getWavesTexture2().replace(waves2Map, GL_RGBA);
-		bitmapWater_.loadFromFile(getDataFile(water->reflection.c_str()), false);
-		GLBitmap bitmapWaterDetail(getDataFile(water->texture.c_str()));
+		bitmapWater_.loadFromFile(getDataFile("%s", water->reflection.c_str()), false);
+		GLBitmap bitmapWaterDetail(getDataFile("%s", water->texture.c_str()));
 		wMap_.getWaterDetail().replace(bitmapWaterDetail, GL_RGB, true);
 		wWaves_.getWavesColor() = water->wavecolor;
 
 		// Generate the water texture for the spray sprite
 		std::string sprayMaskFile = getDataFile("data/textures/smoke01.bmp");
 		GLBitmap sprayMaskBitmap(sprayMaskFile.c_str(), sprayMaskFile.c_str(), false);
-		GLBitmap bitmapWater(getDataFile(water->reflection.c_str()));
+		GLBitmap bitmapWater(getDataFile("%s", water->reflection.c_str()));
 		bitmapWater.resize(
 			sprayMaskBitmap.getWidth(), sprayMaskBitmap.getHeight());
 		GLBitmap textureWaterNew(
Only in scorched/src/ode: error.cpp.orig
diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
--- scorched.orig/src/scorched/MainDialog.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-11 15:18:07.000000000 +0100
@@ -171,7 +171,7 @@
 {
 	wxButton *button = 0;
 	wxBitmap bitmap;
-	const char *bitmapFile = getDataFile(bitmapName);
+	const char *bitmapFile = getDataFile("%s", bitmapName);
 	if (bitmap.LoadFile(wxString(bitmapFile, wxConvUTF8), wxBITMAP_TYPE_BMP) &&
 		bitmap.Ok())
 	{
Only in scorched/src/scorched: MainDialog.cpp~
diff -ur scorched.orig/src/scorched/NetDialog.cpp scorched/src/scorched/NetDialog.cpp
--- scorched.orig/src/scorched/NetDialog.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/scorched/NetDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -510,7 +510,7 @@
 			strcat(buffer, " -username ");
 			strcat(buffer, username.mb_str(wxConvUTF8));
 		}
-		runScorched3D(buffer);
+		runScorched3D("%s", buffer);
 	}
 	return false;
 }
diff -ur scorched.orig/src/scorched/ServerDialog.cpp scorched/src/scorched/ServerDialog.cpp
--- scorched.orig/src/scorched/ServerDialog.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/scorched/ServerDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -573,7 +573,7 @@
 	{
 		Logger::log( "Says \"%s\"", 
 			entryDialog.GetValue().GetData());
-		ServerCommon::sendString(0, entryDialog.GetValue().mb_str(wxConvUTF8));
+		ServerCommon::sendString(0, "%s", entryDialog.GetValue().mb_str(wxConvUTF8));
 	}
 }
 
@@ -600,7 +600,7 @@
 				if (!tank->getTankAI())
 				{
 					ServerCommon::sendString(tank->getDestinationId(), 
-						entryDialog.GetValue().mb_str(wxConvUTF8));
+						"%s", entryDialog.GetValue().mb_str(wxConvUTF8));
 				}
 			}
 		}
diff -ur scorched.orig/src/scorched/SingleChoiceDialog.cpp scorched/src/scorched/SingleChoiceDialog.cpp
--- scorched.orig/src/scorched/SingleChoiceDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/SingleChoiceDialog.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -106,7 +106,7 @@
 		char *desc = (char *) entry.description.c_str();
 
 		wxObjectRefData *refData = new SingleChoiceFrameData(
-			getDataFile(entry.gamefile.c_str()));
+			getDataFile("%s", entry.gamefile.c_str()));
 		addButtonToWindow(useId++, 
 			desc, icon, 
 			this, gridsizer, refData);
Only in scorched/src/scorched: SingleChoiceDialog.cpp.orig
diff -ur scorched.orig/src/scorched/SingleGames.cpp scorched/src/scorched/SingleGames.cpp
--- scorched.orig/src/scorched/SingleGames.cpp	2004-11-25 21:19:34.000000000 +0100
+++ scorched/src/scorched/SingleGames.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -56,7 +56,7 @@
 	if (!mainNode->getNamedChild("description", description)) return false;
 	if (!mainNode->getNamedChild("icon", icon)) return false;
 	if (!mainNode->getNamedChild("url", url)) return false;
-	if (!checkDataFile(icon.c_str())) return false;
+	if (!checkDataFile("%s", icon.c_str())) return false;
 
 	XMLNode *gameNode = 0;
 	while (file.getRootNode()->getNamedChild("game", gameNode, false))
@@ -65,8 +65,8 @@
 		if (!gameNode->getNamedChild("description", entry.description)) return false;
 		if (!gameNode->getNamedChild("icon", entry.icon)) return false;
 		if (!gameNode->getNamedChild("gamefile", entry.gamefile)) return false;
-		if (!checkDataFile(entry.icon.c_str())) return false;
-		if (!checkDataFile(entry.gamefile.c_str())) return false;
+		if (!checkDataFile("%s", entry.icon.c_str())) return false;
+		if (!checkDataFile("%s", entry.gamefile.c_str())) return false;
 		if (!gameNode->failChildren()) return false;
 		entries.push_back(entry);
 	}
diff -ur scorched.orig/src/scorched/main.cpp scorched/src/scorched/main.cpp
--- scorched.orig/src/scorched/main.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/scorched/main.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -100,7 +100,7 @@
 			itor++)
 		{
 			const char *modDir = (*itor).c_str();
-			std::string src = getModFile(modDir);
+			std::string src = getModFile("%s", modDir);
 			std::string dest = getSettingsFile("/oldmods/%s-%u", modDir, time(0));
 			if (DefinesUtil::dirExists(src.c_str()))
 			{
Only in scorched/src/scorched: main.cpp~
diff -ur scorched.orig/src/server/ServerAdminHandler.cpp scorched/src/server/ServerAdminHandler.cpp
--- scorched.orig/src/server/ServerAdminHandler.cpp	2005-06-20 02:35:08.000000000 +0200
+++ scorched/src/server/ServerAdminHandler.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -142,7 +142,7 @@
 			result +=
 				"-----------------------------------------------------\n";
 
-			ServerCommon::sendString(destinationId, result.c_str());
+			ServerCommon::sendString(destinationId, "%s", result.c_str());
 		}
 		break;
 	case ComsAdminMessage::AdminLogout:
@@ -193,7 +193,7 @@
 			result +=
 				"-----------------------------------------------------\n";
 
-			ServerCommon::sendString(destinationId, result.c_str());
+			ServerCommon::sendString(destinationId, "%s", result.c_str());
 		}
 		break;
 	case ComsAdminMessage::AdminShowAliases:
@@ -221,7 +221,7 @@
 				result +=
 					"-----------------------------------------------------\n";
 
-				ServerCommon::sendString(destinationId, result.c_str());
+				ServerCommon::sendString(destinationId, "%s", result.c_str());
 			}
 			else ServerCommon::sendString(destinationId, "Unknown player for showaliases");
 		}
@@ -251,7 +251,7 @@
 				result +=
 					"-----------------------------------------------------\n";
 
-				ServerCommon::sendString(destinationId, result.c_str());
+				ServerCommon::sendString(destinationId, "%s", result.c_str());
 			}
 			else ServerCommon::sendString(destinationId, "Unknown player for showipaliases");
 		}
@@ -391,21 +391,21 @@
 			adminTank->getName(),
 			message.getParam1());
 
-		ServerCommon::sendString(0, message.getParam1());
+		ServerCommon::sendString(0, "%s", message.getParam1());
 		break;
 	case ComsAdminMessage::AdminAdminTalk:
 		ServerCommon::serverLog(0,
 			"\"%s\" admin admintalk \"%s\"",
 			adminTank->getName(),
 			message.getParam1());
-		ServerCommon::sendStringAdmin(message.getParam1());
+		ServerCommon::sendStringAdmin("%s", message.getParam1());
 		break;
 	case ComsAdminMessage::AdminMessage:
 		ServerCommon::serverLog(0,
 			"\"%s\" admin message \"%s\"",
 			adminTank->getName(),
 			message.getParam1());
-		ServerCommon::sendStringMessage(0, message.getParam1());
+		ServerCommon::sendStringMessage(0, "%s", message.getParam1());
 		break;
 	case ComsAdminMessage::AdminKillAll:
 		ServerCommon::serverLog(0,
diff -ur scorched.orig/src/server/ServerCommon.cpp scorched/src/server/ServerCommon.cpp
--- scorched.orig/src/server/ServerCommon.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/server/ServerCommon.cpp	2006-02-11 15:23:57.000000000 +0100
@@ -298,6 +298,6 @@
 		vsnprintf(text, sizeof(text), fmt, ap);
 		va_end(ap);
 
-		Logger::log(text);
+		Logger::log("%s", text);
 	}
 }
Only in scorched/src/server: ServerCommon.cpp~
diff -ur scorched.orig/src/server/ServerNewGameState.cpp scorched/src/server/ServerNewGameState.cpp
--- scorched.orig/src/server/ServerNewGameState.cpp	2005-08-10 14:39:31.000000000 +0200
+++ scorched/src/server/ServerNewGameState.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -296,7 +296,7 @@
 		tankCloseness = height->startcloseness;
 		if (!height->startmask.empty())
 		{
-			tankMask.loadFromFile(getDataFile(height->startmask.c_str()));
+			tankMask.loadFromFile(getDataFile("%s", height->startmask.c_str()));
 			DIALOG_ASSERT(tankMask.getBits());
 		}
 	}
diff -ur scorched.orig/src/server/ServerTimedMessage.cpp scorched/src/server/ServerTimedMessage.cpp
--- scorched.orig/src/server/ServerTimedMessage.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/server/ServerTimedMessage.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -61,6 +61,12 @@
 			entry.lastTime = currentTime;
 			
 			std::string message = entry.messages.front();
+ 			/* Note message.c_str() is a user supplied printf format string
+			   with possible a conversion specifier to display the ctime.
+			   Since these messages are loaded from a local file this is
+			   reasonable safe, although it would be better to just
+			   always prefix times-messages with the ctime and to not
+			   interpreted user supplied data this way. */
 			ServerCommon::sendString(0, message.c_str(), ctime(¤tTime));
 			Logger::log(message.c_str(), ctime(¤tTime));
 			entry.messages.pop_front();
diff -ur scorched.orig/src/server/ServerWebHandler.cpp scorched/src/server/ServerWebHandler.cpp
--- scorched.orig/src/server/ServerWebHandler.cpp	2005-08-14 21:11:42.000000000 +0200
+++ scorched/src/server/ServerWebHandler.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -312,17 +312,17 @@
 		const char *type = getField(fields, "type");
 		if (!type || 0 == strcmp(type, "all"))
 		{
-			ServerCommon::sendString(0, say);
+			ServerCommon::sendString(0, "%s", say);
 			ServerCommon::serverLog(0, "Says : %s", say);
 		}
 		else if (0 == strcmp(type, "message"))
 		{
-			ServerCommon::sendStringMessage(0, say);
+			ServerCommon::sendStringMessage(0, "%s", say);
 			ServerCommon::serverLog(0, "Messages : %s", say);
 		}
 		else if (0 == strcmp(type, "admin"))
 		{
-			ServerCommon::sendStringAdmin(say);
+			ServerCommon::sendStringAdmin("%s", say);
 			ServerCommon::serverLog(0, "Admins Says : %s", say);
 		}
 	}
diff -ur scorched.orig/src/sound/Sound.cpp scorched/src/sound/Sound.cpp
--- scorched.orig/src/sound/Sound.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/sound/Sound.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -118,19 +118,19 @@
 	alDistanceModel(AL_INVERSE_DISTANCE);
 
 	GLConsole::instance()->addLine(false, "AL_VENDOR:");
-	GLConsole::instance()->addLine(false, 
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_VENDOR)));
 	GLConsole::instance()->addLine(false, "AL_VERSION:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_VERSION)));
 	GLConsole::instance()->addLine(false, "AL_RENDERER:");
-	GLConsole::instance()->addLine(false, 
+	GLConsole::instance()->addLine(false, "%s", 
 		checkString((char *) alGetString(AL_RENDERER)));
 	GLConsole::instance()->addLine(false, "AL_EXTENSIONS:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alGetString(AL_EXTENSIONS)));
 	GLConsole::instance()->addLine(false, "ALC_DEVICE_SPECIFIER:");
-	GLConsole::instance()->addLine(false,
+	GLConsole::instance()->addLine(false, "%s",
 		checkString((char *) alcGetString(soundDevice, ALC_DEVICE_SPECIFIER)));
 
 	// Create all sound channels
diff -ur scorched.orig/src/sprites/ExplosionLaserBeamRenderer.cpp scorched/src/sprites/ExplosionLaserBeamRenderer.cpp
--- scorched.orig/src/sprites/ExplosionLaserBeamRenderer.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/sprites/ExplosionLaserBeamRenderer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -49,7 +49,7 @@
 	{
 		SoundBuffer *firedSound = 
 			Sound::instance()->fetchOrCreateBuffer( (char*)
-				getDataFile(data));
+				getDataFile("%s", data));
 		SoundUtils::playAbsoluteSound(VirtualSoundPriority::eAction,
 			firedSound, position);
 	}
diff -ur scorched.orig/src/sprites/ExplosionTextures.cpp scorched/src/sprites/ExplosionTextures.cpp
--- scorched.orig/src/sprites/ExplosionTextures.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/sprites/ExplosionTextures.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -193,7 +193,7 @@
 			return *(*findItor).second;
 		}
 
-		const char *fileName = getDataFile(name);
+		const char *fileName = getDataFile("%s", name);
 		if (DefinesUtil::fileExists(fileName))
 		{
 			GLBitmap *map = new GLBitmap;
diff -ur scorched.orig/src/sprites/MissileActionRenderer.cpp scorched/src/sprites/MissileActionRenderer.cpp
--- scorched.orig/src/sprites/MissileActionRenderer.cpp	2005-07-11 01:41:56.000000000 +0200
+++ scorched/src/sprites/MissileActionRenderer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -92,7 +92,7 @@
 		if (0 != strcmp("none", engineSound))
 		{
 			SoundBuffer *rocket = Sound::instance()->fetchOrCreateBuffer(
-				(char *) getDataFile(engineSound));
+				(char *) getDataFile("%s", engineSound));
 			sound_ = new VirtualSoundSource(VirtualSoundPriority::eMissile, true, false);
 			sound_->setPosition(shot->getCurrentPosition());
 			sound_->setGain(0.25f);
diff -ur scorched.orig/src/sprites/TextActionRenderer.cpp scorched/src/sprites/TextActionRenderer.cpp
--- scorched.orig/src/sprites/TextActionRenderer.cpp	2004-02-25 01:49:49.000000000 +0100
+++ scorched/src/sprites/TextActionRenderer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -55,7 +55,7 @@
 	GLState currentState(GLState::DEPTH_ON | GLState::TEXTURE_ON);
 	glDepthMask(GL_FALSE);
 	GLWFont::instance()->getSmallPtFont()->drawBilboard(color_, 1.0f, 
-		position_[0], position_[1], position_[2],
+		position_[0], position_[1], position_[2], "%s",
 		text_.c_str());
 
 	glDepthMask(GL_TRUE);
diff -ur scorched.orig/src/tankgraph/GLWTankViewer.cpp scorched/src/tankgraph/GLWTankViewer.cpp
--- scorched.orig/src/tankgraph/GLWTankViewer.cpp	2005-06-04 03:56:53.000000000 +0200
+++ scorched/src/tankgraph/GLWTankViewer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -215,6 +215,7 @@
 				{
 					toolTip_.setText(
 						"Model",
+						"%s",
 						models_[vectorPos]->getId().getModelName());			
 				}
 
@@ -293,7 +294,7 @@
 	Vector color(0.3f, 0.3f, 0.3f);
 	GLWFont::instance()->getSmallPtFont()->
 		drawWidth(int(TankSquareSize * 2 + TankPadding), 
-			color, 10.0f, -70.0f, 75.0f, 0.0f, 
+			color, 10.0f, -70.0f, 75.0f, 0.0f, "%s",
 			models_[pos]->getId().getModelName());
 	GLWFont::instance()->getSmallPtFont()->
 		drawWidth(int(TankSquareSize * 2 + TankPadding), 
diff -ur scorched.orig/src/tankgraph/TankMenus.cpp scorched/src/tankgraph/TankMenus.cpp
--- scorched.orig/src/tankgraph/TankMenus.cpp	2006-02-11 15:14:43.000000000 +0100
+++ scorched/src/tankgraph/TankMenus.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -197,7 +197,7 @@
 			currentTank == tank?'>':' ',
 			description,
 			tank->getName(), modelId.getModelName());
-		GLConsole::instance()->addLine(false, buffer);
+		GLConsole::instance()->addLine(false, "%s", buffer);
 	}
 
 	GLConsole::instance()->addLine(false,
diff -ur scorched.orig/src/tankgraph/TankModelRenderer.cpp scorched/src/tankgraph/TankModelRenderer.cpp
--- scorched.orig/src/tankgraph/TankModelRenderer.cpp	2005-07-19 23:45:37.000000000 +0200
+++ scorched/src/tankgraph/TankModelRenderer.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -170,14 +170,14 @@
 	{
 		Vector &bilX = GLCameraFrustum::instance()->getBilboardVectorX(); 
 		bilX *= 0.5f * (float) GLWFont::instance()->getSmallPtFont()->getWidth(
-			1, tank_->getName());
+			1, "%s", tank_->getName());
 
 		glDepthMask(GL_FALSE);
 		GLWFont::instance()->getSmallPtFont()->drawBilboard(
 			tank_->getColor(), 1,
 			(float) tank_->getPhysics().getTankPosition()[0] - bilX[0], 
 			(float) tank_->getPhysics().getTankPosition()[1] - bilX[1], 
-			(float) height + 8.0f,
+			(float) height + 8.0f, "%s",
 			tank_->getName());
 		glDepthMask(GL_TRUE);
 	}
@@ -188,7 +188,7 @@
 		if (OptionsDisplay::instance()->getDrawPlayerNames())
 		{
 			bilX *= 0.5f * (float) GLWFont::instance()->getSmallPtFont()->getWidth(
-				1, tank_->getName());
+				1, "%s", tank_->getName());
 			bilX += bilX.Normalize() * 1.0f;
 		}
 		else
@@ -633,11 +633,11 @@
 			GLWFont::instance()->getSmallPtFont()->draw(
 				yellow, 10,
 				(float) posX_ + 47.0f, (float) posY_ - 4.0f, (float) posZ_,
-				TankModelRendererHUD::getTextA());
+				"%s", TankModelRendererHUD::getTextA());
 			GLWFont::instance()->getSmallPtFont()->draw(
 				yellow, 10,
 				(float) posX_ + 47.0f, (float) posY_ - 15.0f, (float) posZ_,
-				TankModelRendererHUD::getTextB());
+				"%s", TankModelRendererHUD::getTextB());
 
 			if (TankModelRendererHUD::getPercentage() >= 0.0f)
 			{
diff -ur scorched.orig/src/weapons/Accessory.cpp scorched/src/weapons/Accessory.cpp
--- scorched.orig/src/weapons/Accessory.cpp	2005-06-11 18:53:41.000000000 +0200
+++ scorched/src/weapons/Accessory.cpp	2006-02-11 15:14:55.000000000 +0100
@@ -65,7 +65,7 @@
 
 	// Get the accessory description
 	accessoryNode->getNamedChild("description", description_, false);
-	toolTip_.setText(getName(), getDescription());
+	toolTip_.setText(getName(), "%s", getDescription());
 
 	// Get the accessory icon
 	if (accessoryNode->getNamedChild("icon", iconName_, false))

scorched3d-gcc41.patch:

--- NEW FILE scorched3d-gcc41.patch ---
--- scorched/src/landscape/LandscapePoints.h.gcc41	2006-02-05 20:16:45.000000000 +0100
+++ scorched/src/landscape/LandscapePoints.h	2006-02-05 20:16:58.000000000 +0100
@@ -41,7 +41,7 @@
 	int noPts_;
 
 	void createPoints(HeightMap &map, int width, int points);
-	void LandscapePoints::findPoint(HeightMap &map, Position *pos, float x, float y);
+	void findPoint(HeightMap &map, Position *pos, float x, float y);
 };
 
 #endif
--- scorched/src/landscape/MovementMap.h.gcc41	2005-08-10 14:39:31.000000000 +0200
+++ scorched/src/landscape/MovementMap.h	2006-02-05 20:15:27.000000000 +0100
@@ -65,7 +65,7 @@
 	MovementMapEntry *entries_;
 	HeightMap &hMap_;
 
-	unsigned int MovementMap::POINT_TO_UINT(unsigned int x, unsigned int y);
+	unsigned int POINT_TO_UINT(unsigned int x, unsigned int y);
 	void addPoint(unsigned int x, unsigned int y, 
 					 float height, float dist,
 					 std::map &edgeMap,

scorched3d-help.patch:

--- NEW FILE scorched3d-help.patch ---
--- scorched/src/scorched/MainDialog.cpp.help	2006-02-06 12:24:58.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-06 12:25:42.000000000 +0100
@@ -131,8 +131,8 @@
 #ifdef __DARWIN__
 	system(formatString("open %s", url));
 #else
-	system(formatString("mozilla %s", url));
-	dialogMessage("Web site location", "%s", url);
+	system(formatString("htmlview %s&", url));
+ 	// dialogMessage("Web site location", "%s", url);
 #endif // __DARWIN__
 #endif // _WIN32
 }
--- scorched/src/scorched/HtmlHelpDialog.cpp.help	2006-02-09 19:14:11.000000000 +0100
+++ scorched/src/scorched/HtmlHelpDialog.cpp	2006-02-09 19:14:49.000000000 +0100
@@ -137,13 +137,13 @@
 void HelpFrame::onHome(wxCommandEvent &event)
 {
 	html_->HistoryClear();
-	html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8));
+	html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8));
 }
 
 void showHtmlHelpDialog()
 {
 	// For the moment just show the documentation in the default web browser
-	showURL(getDocFile("documentation/html/index.html"));
+	showURL(getDocFile("html/index.html"));
 
 	//HelpFrame *frame = new HelpFrame();
 	//frame->Show();

scorched3d-negint.patch:

--- NEW FILE scorched3d-negint.patch ---
--- scorched.orig/src/server/ServerConnectHandler.cpp.negint	2006-02-11 16:54:09.000000000 +0100
+++ scorched.orig/src/server/ServerConnectHandler.cpp	2006-02-11 16:58:06.000000000 +0100
@@ -121,9 +121,9 @@
 	}
 
 	// Check player availability
-	if ((int) message.getNoPlayers() > 
+	if (message.getNoPlayers() > (unsigned int)(
 		ScorchedServer::instance()->getOptionsGame().getNoMaxPlayers() -
-		ScorchedServer::instance()->getTankContainer().getNoOfTanks())
+		ScorchedServer::instance()->getTankContainer().getNoOfTanks()))
 	{
 		ServerCommon::sendString(destinationId, 
 			"--------------------------------------------------\n"

scorched3d-openal.patch:

--- NEW FILE scorched3d-openal.patch ---
--- scorched/configure.ac.openal	2006-02-06 10:55:19.000000000 +0100
+++ scorched/configure.ac	2006-02-06 10:55:31.000000000 +0100
@@ -114,7 +114,7 @@
 	if test x"$use_static_openal" = x"yes"; then
 		LIBS="$LIBS /usr/local/lib/libopenal.a"
 	else
-		LIBS="$LIBS `$OPENAL_CONFIG --libs`"
+		LIBS="$LIBS `$OPENAL_CONFIG --libs` -lalut"
 	fi
 	
 	CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`"

scorched3d-opengl-without-context.patch:

--- NEW FILE scorched3d-opengl-without-context.patch ---
diff -ur scorched.orig/src/landscape/LandscapeMaps.cpp scorched/src/landscape/LandscapeMaps.cpp
--- scorched.orig/src/landscape/LandscapeMaps.cpp	2006-02-12 11:09:19.000000000 +0100
+++ scorched/src/landscape/LandscapeMaps.cpp	2006-02-12 10:27:33.000000000 +0100
@@ -92,7 +92,8 @@
 
 void LandscapeMaps::generateObjects(
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	LandscapeTex *tex = &getTex(context);
 
@@ -115,7 +114,7 @@
 			}
 			RandomGenerator objectsGenerator;
 			objectsGenerator.seed(getSeed());
-			objects_.generate(objectsGenerator, *place, context, counter);
+			objects_.generate(objectsGenerator, *place, context, counter, server);
 		}
 	}
 }
diff -ur scorched.orig/src/landscape/LandscapeMaps.h scorched/src/landscape/LandscapeMaps.h
--- scorched.orig/src/landscape/LandscapeMaps.h	2005-06-13 10:24:37.000000000 +0200
+++ scorched/src/landscape/LandscapeMaps.h	2006-02-12 10:23:51.000000000 +0100
@@ -57,7 +57,8 @@
 		LandscapeDefinition *hdef,
 		ProgressCounter *counter = 0);
 	void generateObjects(ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 
 	// Compresses the level into a form that can be
 	// sent to the clients
diff -ur scorched.orig/src/landscape/LandscapeObjects.cpp scorched/src/landscape/LandscapeObjects.cpp
--- scorched.orig/src/landscape/LandscapeObjects.cpp	2005-07-17 13:32:05.000000000 +0200
+++ scorched/src/landscape/LandscapeObjects.cpp	2006-02-12 10:36:17.000000000 +0100
@@ -111,7 +111,8 @@
 void LandscapeObjects::generate(RandomGenerator &generator, 
 	LandscapePlace &place,
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	if (counter) counter->setNewOp("Populating Landscape");
 
@@ -130,7 +131,7 @@
 			LandscapePlaceObjectsPlacementTree *placement =
 				(LandscapePlaceObjectsPlacementTree *)
 					place.objects[i];
-			gen.generateObjects(generator, *placement, context, counter);
+			gen.generateObjects(generator, *placement, context, counter, server);
 		}
 		else if (0 == strcmp(placementtype.c_str(), "mask"))
 		{
@@ -139,7 +140,7 @@
 			LandscapePlaceObjectsPlacementMask *placement =
 				(LandscapePlaceObjectsPlacementMask *)
 					place.objects[i];
-			gen.generateObjects(generator, *placement, context, counter);
+			gen.generateObjects(generator, *placement, context, counter, server);
 		}
 		else if (0 == strcmp(placementtype.c_str(), "direct"))
 		{
@@ -148,7 +149,7 @@
 			LandscapePlaceObjectsPlacementDirect *placement =
 				(LandscapePlaceObjectsPlacementDirect *)
 					place.objects[i];
-			gen.generateObjects(generator, *placement, context, counter);
+			gen.generateObjects(generator, *placement, context, counter, server);
 		}
 		else
 		{
diff -ur scorched.orig/src/landscape/LandscapeObjects.h scorched/src/landscape/LandscapeObjects.h
--- scorched.orig/src/landscape/LandscapeObjects.h	2005-07-17 13:32:05.000000000 +0200
+++ scorched/src/landscape/LandscapeObjects.h	2006-02-12 10:28:11.000000000 +0100
@@ -40,7 +40,8 @@
 	void generate(RandomGenerator &generator, 
 		LandscapePlace &place,
 		ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 
 	void removeAllObjects();
 	void removeObjects(ScorchedContext &context,
diff -ur scorched.orig/src/landscape/LandscapeObjectsPlacement.cpp scorched/src/landscape/LandscapeObjectsPlacement.cpp
--- scorched.orig/src/landscape/LandscapeObjectsPlacement.cpp	2006-02-12 11:09:19.000000000 +0100
+++ scorched/src/landscape/LandscapeObjectsPlacement.cpp	2006-02-12 10:45:42.000000000 +0100
@@ -34,7 +34,8 @@
 	RandomGenerator &generator, 
 	LandscapePlaceObjectsPlacementTree &placement,
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	// Generate a map of where the trees should go
 	unsigned char objectMap[64 * 64];
@@ -164,7 +165,12 @@
 			placement.objecttype.c_str());
 	}
 
-	float mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
+	float mult;
+	// Do not draw/use Landscape::instance()->getMainMap() when running
+	// as server, because LandScape uses openGL functions and the server
+	// does not have an openGL context set.
+	if (!server)
+		mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
 
 	LandscapeObjectsGroupEntry *group = 0;
 	if (placement.groupname.c_str()[0])
@@ -219,8 +226,12 @@
 					//Vector position(entry->posX, entry->posY, entry->posZ);
 					//DeformLandscape::flattenArea(context, position, 0);
 
-					GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-						lx * mult, ly * mult, modelSize * entry->size * mult, 1.0f);
+					// Do not draw/use Landscape::instance()->getMainMap() when running
+					// as server, because LandScape uses openGL functions and the server
+					// does not have an openGL context set.
+					if (!server)
+						GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+							lx * mult, ly * mult, modelSize * entry->size * mult, 1.0f);
 				}
 				else
 				{
@@ -237,8 +248,12 @@
 					entry->removeaction = placement.removeaction;
 					entry->burnaction = placement.burnaction;				
 					
-					GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-						lx * mult, ly * mult, entry->size * mult, 1.0f);
+					// Do not draw/use Landscape::instance()->getMainMap() when running
+					// as server, because LandScape uses openGL functions and the server
+					// does not have an openGL context set.
+					if (!server)
+						GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+							lx * mult, ly * mult, entry->size * mult, 1.0f);
 				}
 
 				context.landscapeMaps->getObjects().addObject(
@@ -260,7 +275,8 @@
 	RandomGenerator &generator, 
 	LandscapePlaceObjectsPlacementMask &placement,
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	bool pine = true;
 	float snowHeight = 20.0f;
@@ -313,10 +329,14 @@
 			placement.groupname.c_str(), true);
 	}
 
-	float mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
-
+	float mult; 
 	const int NoIterations = placement.numobjects;
 	int objectCount = 0;
+	// Do not draw/use Landscape::instance()->getMainMap() when running
+	// as server, because LandScape uses openGL functions and the server
+	// does not have an openGL context set.
+	if (!server)
+		mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
 	for (int i=0; iposX, entry->posY, entry->posZ);
 						//DeformLandscape::flattenArea(context, position, 0);
 
-						GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-							lx * mult, ly * mult, modelSize * entry->size * mult, 1.0f);
+						// Do not draw/use Landscape::instance()->getMainMap() when running
+						// as server, because LandScape uses openGL functions and the server
+						// does not have an openGL context set.
+						if (!server)
+							GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+								lx * mult, ly * mult, modelSize * entry->size * mult, 1.0f);
 					}
 					else
 					{
@@ -420,8 +444,12 @@
 						entry->removeaction = placement.removeaction;
 						entry->burnaction = placement.burnaction;
 						
-						GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-							lx * mult, ly * mult, entry->size * mult, 1.0f);
+						// Do not draw/use Landscape::instance()->getMainMap() when running
+						// as server, because LandScape uses openGL functions and the server
+						// does not have an openGL context set.
+						if (!server)
+							GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+								lx * mult, ly * mult, entry->size * mult, 1.0f);
 					}
 
 					context.landscapeMaps->getObjects().addObject(
@@ -444,7 +472,8 @@
 	RandomGenerator &generator, 
 	LandscapePlaceObjectsPlacementDirect &placement,
 	ScorchedContext &context,
-	ProgressCounter *counter)
+	ProgressCounter *counter,
+	bool server)
 {
 	bool pine = true;
 	float snowHeight = 20.0f;
@@ -489,7 +518,12 @@
 			placement.groupname.c_str(), true);
 	}
 
-	float mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
+	float mult;
+	// Do not draw/use Landscape::instance()->getMainMap() when running
+	// as server, because LandScape uses openGL functions and the server
+	// does not have an openGL context set.
+	if (!server)
+		mult = (float) Landscape::instance()->getMainMap().getWidth() / 256.0f;
 
 	std::list::iterator itor;
 	int i = 0;
@@ -526,9 +560,13 @@
 			//Vector position(entry->posX, entry->posY, entry->posZ);
 			//DeformLandscape::flattenArea(context, position, 0);
 
-			GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-				position.position[0] * mult, position.position[1] * mult, 
-				modelSize * entry->size * mult, 1.0f);
+			// Do not draw/use Landscape::instance()->getMainMap() when running
+			// as server, because LandScape uses openGL functions and the server
+			// does not have an openGL context set.
+			if (!server)
+				GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+					position.position[0] * mult, position.position[1] * mult, 
+					modelSize * entry->size * mult, 1.0f);
 		}
 		else
 		{
@@ -545,9 +583,13 @@
 			entry->removeaction = placement.removeaction;
 			entry->burnaction = placement.burnaction;
 			
-			GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
-				position.position[0] * mult, position.position[1] * mult, 
-				entry->size * mult, 1.0f);
+			// Do not draw/use Landscape::instance()->getMainMap() when running
+			// as server, because LandScape uses openGL functions and the server
+			// does not have an openGL context set.
+			if (!server)
+				GLBitmapModifier::addCircle(Landscape::instance()->getMainMap(),
+					position.position[0] * mult, position.position[1] * mult, 
+					entry->size * mult, 1.0f);
 		}
 
 		context.landscapeMaps->getObjects().addObject(
diff -ur scorched.orig/src/landscape/LandscapeObjectsPlacement.h scorched/src/landscape/LandscapeObjectsPlacement.h
--- scorched.orig/src/landscape/LandscapeObjectsPlacement.h	2005-06-15 16:21:59.000000000 +0200
+++ scorched/src/landscape/LandscapeObjectsPlacement.h	2006-02-12 10:35:17.000000000 +0100
@@ -33,7 +33,8 @@
 		RandomGenerator &generator, 
 		LandscapePlaceObjectsPlacementTree &placement,
 		ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 };
 
 class LandscapePlaceObjectsPlacementMask;
@@ -44,7 +45,8 @@
 		RandomGenerator &generator, 
 		LandscapePlaceObjectsPlacementMask &placement,
 		ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 };
 
 class LandscapePlaceObjectsPlacementDirect;
@@ -55,7 +57,8 @@
 		RandomGenerator &generator, 
 		LandscapePlaceObjectsPlacementDirect &placement,
 		ScorchedContext &context,
-		ProgressCounter *counter = 0);
+		ProgressCounter *counter = 0,
+		bool server = false);
 };
 
 #endif // __INCLUDE_LandscapeObjectsPlacementh_INCLUDE__
diff -ur scorched.orig/src/server/ServerNewGameState.cpp scorched/src/server/ServerNewGameState.cpp
--- scorched.orig/src/server/ServerNewGameState.cpp	2006-02-12 11:09:19.000000000 +0100
+++ scorched/src/server/ServerNewGameState.cpp	2006-02-12 10:24:15.000000000 +0100
@@ -133,7 +133,7 @@
 	ScorchedServer::instance()->getContext().landscapeMaps->generateHMap(
 		ScorchedServer::instance()->getContext(), defn);
 	ScorchedServer::instance()->getContext().landscapeMaps->generateObjects(
-		ScorchedServer::instance()->getContext());
+		ScorchedServer::instance()->getContext(), 0, 1);
 
 	// Set the start positions for the tanks
 	// Must be generated after the level as it alters the

scorched3d-pgsql.patch:

--- NEW FILE scorched3d-pgsql.patch ---
diff -ur scorched.orig/src/common/StatsLoggerPGSQL.cpp scorched/src/common/StatsLoggerPGSQL.cpp
--- scorched.orig/src/common/StatsLoggerPGSQL.cpp	2005-03-22 18:45:49.000000000 +0100
+++ scorched/src/common/StatsLoggerPGSQL.cpp	2006-02-10 11:50:42.000000000 +0100
@@ -72,8 +72,8 @@
     int sqlLen = vsnprintf(text, SQL_BUFFER_SIZE, fmt, ap);
     va_end(ap);
 
-    if(sqlLen >= SQL_BUFFER_SIZE) {
-        Logger::log(0, "pgsql: Query failed, too long.\n");
+    if(sqlLen >= SQL_BUFFER_SIZE || sqlLen < 0) {
+        Logger::log("pgsql: Query failed, too long.\n");
         return false;
     }
 
@@ -113,15 +113,15 @@
                         passwd.c_str());
                 if (pgsql_ && PQstatus(pgsql_) == CONNECTION_OK)
                 {
-                    Logger::log(0, "pgsql stats logger started");
+                    Logger::log("pgsql stats logger started");
                 }
                 else
                 {
                     success_ = false;
-                    Logger::log(0, "pgsql stats logger failed to start. "
+                    Logger::log("pgsql stats logger failed to start. "
                             "Error: %s",
                             PQerrorMessage(pgsql_));
-                    Logger::log(0, "pgsql params : host %s, user %s, passwd %s, db %s",
+                    Logger::log("pgsql params : host %s, user %s, passwd %s, db %s",
                             host.c_str(), user.c_str(),
                             passwd.c_str(), db.c_str());
                     if(pgsql_) {
@@ -133,13 +133,13 @@
             else
             {
                 success_ = false;
-                Logger::log(0, "Failed to parse %s settings file.", fileName);
+                Logger::log("Failed to parse %s settings file.", fileName);
             }
         }
         else
         {	
             success_ = false;
-            Logger::log(0, "Failed to parse %s settings file. Error: %s", 
+            Logger::log("Failed to parse %s settings file. Error: %s", 
                     fileName,
                     file.getParserError());
         }
@@ -618,11 +618,11 @@
         if(lastresult_ && PQntuples(lastresult_) > 0) {
             playerId = atoi(PQgetvalue(lastresult_,0,0));
         }
-        Logger::log(0, "Add new stats user \"%i\"", playerId);
+        Logger::log("Add new stats user \"%i\"", playerId);
     }
     else
     {
-        Logger::log(0, "Found stats user \"%i\"", playerId);
+        Logger::log("Found stats user \"%i\"", playerId);
     }
 
     // Store this new player id

scorched3d-sprintf.patch:

--- NEW FILE scorched3d-sprintf.patch ---
diff -ur scorched.orig/src/3dsparse/MSModelFactory.cpp scorched/src/3dsparse/MSModelFactory.cpp
--- scorched.orig/src/3dsparse/MSModelFactory.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/3dsparse/MSModelFactory.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -278,7 +278,8 @@
 		if (sscanf(buffer, "%s", textureName) != 1)
 			returnError(fileName, "No material texture format");
 		textureName[strlen(textureName)-1] = '\0';
-		sprintf(fullTextureName, "%s/%s", filePath, &textureName[1]);
+		snprintf(fullTextureName, sizeof(fullTextureName), "%s/%s",
+			filePath, &textureName[1]);
 		while (sep=strchr(fullTextureName, '\\')) *sep = '/';
 
 		// alphamap
@@ -289,7 +290,8 @@
 		if (sscanf(buffer, "%s", textureNameAlpha) != 1)
 			returnError(fileName, "No material alpha texture format");
 		textureNameAlpha[strlen(textureNameAlpha)-1] = '\0';
-		sprintf(fullTextureAlphaName, "%s/%s", filePath, &textureNameAlpha[1]);
+		snprintf(fullTextureAlphaName, sizeof(fullTextureAlphaName),
+			"%s/%s", filePath, &textureNameAlpha[1]);
 		while (sep=strchr(fullTextureAlphaName, '\\')) *sep = '/';
 
 		int modelIndex = 0;
diff -ur scorched.orig/src/3dsparse/ModelID.cpp scorched/src/3dsparse/ModelID.cpp
--- scorched.orig/src/3dsparse/ModelID.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/3dsparse/ModelID.cpp	2006-02-11 15:10:00.000000000 +0100
@@ -75,7 +75,8 @@
 		if (!modelNode->getNamedChild("mesh", meshNode)) return false;
 		const char *meshNameContent = meshNode->getContent();
 		static char meshName[1024];
-		sprintf(meshName, "%s/%s", directory, meshNameContent);
+		snprintf(meshName, sizeof(meshName), "%s/%s", directory,
+			meshNameContent);
 		if (!DefinesUtil::fileExists(getDataFile(meshName)))
 		{
 			dialogMessage("Scorched Models",
@@ -89,7 +90,8 @@
 		static char skinName[1024];
 		if (strcmp(skinNameContent, "none") != 0)
 		{
-			sprintf(skinName, "%s/%s", directory, skinNameContent);
+			snprintf(skinName, sizeof(skinName), "%s/%s",
+				directory, skinNameContent);
 			if (!DefinesUtil::fileExists(getDataFile(skinName)))
 			{
 				dialogMessage("Scorched Models",
@@ -100,7 +102,8 @@
 		}
 		else
 		{
-			sprintf(skinName, "%s", skinNameContent);
+			snprintf(skinName, sizeof(skinName), "%s",
+				skinNameContent);
 		}
 
 		meshName_ = meshName;
@@ -110,7 +113,8 @@
 	{
 		const char *meshNameContent = modelNode->getContent();
 		static char meshName[1024];
-		sprintf(meshName, "%s/%s", directory, meshNameContent);
+		snprintf(meshName, sizeof(meshName), "%s/%s", directory,
+			meshNameContent);
 
 		if (!DefinesUtil::fileExists(getDataFile(meshName)))
 		{
Only in scorched/src/3dsparse: ModelID.cpp~
diff -ur scorched.orig/src/3dsparse/aseFile.tab.cpp scorched/src/3dsparse/aseFile.tab.cpp
--- scorched.orig/src/3dsparse/aseFile.tab.cpp	2005-04-12 00:19:08.000000000 +0200
+++ scorched/src/3dsparse/aseFile.tab.cpp	2006-02-11 15:10:46.000000000 +0100
@@ -1056,7 +1056,7 @@
 int aseerror(const char *errmsg)
 {
 	char buffer[1024];
-	sprintf(buffer, "%i:%s\n", aselineno, errmsg);
+	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, errmsg);
 	dialogMessage("Lexer", buffer);
     return 0;
 }
@@ -1064,7 +1064,7 @@
 int asewarning(const char *warningmsg)
 {
 	char buffer[1024];
-	sprintf(buffer, "%i:%s\n", aselineno, warningmsg);
+	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, warningmsg);
 	dialogMessage("Lexer", buffer);
     return 0;
 }
@@ -1072,7 +1072,7 @@
 int asedebug(const char *debugmsg)
 {
 	char buffer[1024];
-	sprintf(buffer, "%i:%s\n", aselineno, debugmsg);
+	snprintf(buffer, sizeof(buffer), "%i:%s\n", aselineno, debugmsg);
 	dialogMessage("Lexer", buffer);
     return 0;
 }
Only in scorched/src/3dsparse: aseFile.tab.cpp~
diff -ur scorched.orig/src/GLEXT/GLConsole.cpp scorched/src/GLEXT/GLConsole.cpp
--- scorched.orig/src/GLEXT/GLConsole.cpp	2005-04-05 00:35:23.000000000 +0200
+++ scorched/src/GLEXT/GLConsole.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -265,7 +265,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, TEXT_SIZE, fmt, ap);
 	va_end(ap);
 
 	DIALOG_ASSERT(strlen(text)getNumberParam(name_.c_str()));
+		snprintf(buffer, sizeof(buffer), "%.2f", user_->getNumberParam(name_.c_str()));
 		value = buffer;
 		break;
 	case GLConsoleRuleTypeString:
diff -ur scorched.orig/src/GLEXT/GLFont2d.cpp scorched/src/GLEXT/GLFont2d.cpp
--- scorched.orig/src/GLEXT/GLFont2d.cpp	2005-07-11 22:40:36.000000000 +0200
+++ scorched/src/GLEXT/GLFont2d.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -56,7 +56,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	float width = 0.0f;
@@ -75,7 +75,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	drawString((GLsizei) strlen(text), color, 1.0f, size, x, y, z, text, false);
@@ -89,7 +89,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	drawString((GLsizei) strlen(text), color, alpha, size, x, y, z, text, false);
@@ -103,7 +103,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	drawString((GLsizei) strlen(text), color, 1.0f, size, x, y, z, text, false, size2);
@@ -118,7 +118,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	int s = start;
@@ -143,7 +143,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	int l = 0;
@@ -165,7 +165,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	drawString((GLsizei) strlen(text), color, 1.0f, size, x, y, z, text, true);
diff -ur scorched.orig/src/GLW/GLWListView.cpp scorched/src/GLW/GLWListView.cpp
--- scorched.orig/src/GLW/GLWListView.cpp	2005-06-20 02:35:07.000000000 +0200
+++ scorched/src/GLW/GLWListView.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -107,7 +107,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	lines_.push_back(text);
diff -ur scorched.orig/src/GLW/GLWScorchedInfo.cpp scorched/src/GLW/GLWScorchedInfo.cpp
--- scorched.orig/src/GLW/GLWScorchedInfo.cpp	2005-02-13 01:05:13.000000000 +0100
+++ scorched/src/GLW/GLWScorchedInfo.cpp	2006-02-11 15:11:46.000000000 +0100
@@ -86,7 +86,7 @@
 			}
 			else
 			{
-				sprintf(buffer, "Force %.0f", 
+				snprintf(buffer, sizeof(buffer), "Force %.0f", 
 					ScorchedClient::instance()->
 					getOptionsTransient().getWindSpeed());
 			}
@@ -237,7 +237,7 @@
 			setToolTip(&model->getTips()->weaponTip);
 
 			static char buffer[256];
-			sprintf(buffer, "%s", 
+			snprintf(buffer, sizeof(buffer), "%s",
 				current->getAccessories().getWeapons().getCurrent()->getName());
 			float weaponWidth = (float) GLWFont::instance()->getSmallPtFont()->
 				getWidth(fontSize_, buffer);
Only in scorched/src/GLW: GLWScorchedInfo.cpp~
Only in scorched/src/GLW: GLWSelectorPart.cpp.orig
diff -ur scorched.orig/src/GLW/GLWToolTip.cpp scorched/src/GLW/GLWToolTip.cpp
--- scorched.orig/src/GLW/GLWToolTip.cpp	2005-08-12 16:20:11.000000000 +0200
+++ scorched/src/GLW/GLWToolTip.cpp	2006-02-11 15:07:49.000000000 +0100
@@ -58,7 +58,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, TEXT_SIZE, fmt, ap);
 	va_end(ap);
 
 	texts_.clear();
Only in scorched/src/GLW: GLWToolTip.cpp~
diff -ur scorched.orig/src/XML/XMLParser.cpp scorched/src/XML/XMLParser.cpp
--- scorched.orig/src/XML/XMLParser.cpp	2005-07-03 01:50:03.000000000 +0200
+++ scorched/src/XML/XMLParser.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -91,7 +91,7 @@
 	name_(name), parent_(0), type_(type)
 {
 	char buffer[20];
-	sprintf(buffer, "%.2f", content);
+	snprintf(buffer, sizeof(buffer), "%.2f", content);
 	content_ = buffer;
 }
 
@@ -460,7 +460,8 @@
 	XML_Error errorCode = XML_GetErrorCode(p_);
 
 	static char message[1024];
-	sprintf(message, "Parse Error, File %s: Line:%i Col:%i Error:%s",
+	snprintf(message, sizeof(message),
+		"Parse Error, File %s: Line:%i Col:%i Error:%s",
 		source_.c_str(),
 		XML_GetCurrentLineNumber(p_),
 		XML_GetCurrentColumnNumber(p_),
diff -ur scorched.orig/src/client/ServerBrowserServerList.cpp scorched/src/client/ServerBrowserServerList.cpp
--- scorched.orig/src/client/ServerBrowserServerList.cpp	2005-06-08 19:29:38.000000000 +0200
+++ scorched/src/client/ServerBrowserServerList.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -54,7 +54,7 @@
 {
 	// Create the message that will be sent to the master server
 	static char buffer[1024];
-	sprintf(buffer, 
+	snprintf(buffer, sizeof(buffer),
 		"GET %s/servers.php HTTP/1.0\r\n"
 		"User-Agent: Scorched3D\r\n"
 		"Host: %s\r\n"
diff -ur scorched.orig/src/client/SpeedChange.cpp scorched/src/client/SpeedChange.cpp
--- scorched.orig/src/client/SpeedChange.cpp	2004-11-22 00:19:51.000000000 +0100
+++ scorched/src/client/SpeedChange.cpp	2006-02-11 15:12:44.000000000 +0100
@@ -58,7 +58,7 @@
 	{
 		GLState state(GLState::BLEND_ON | GLState::TEXTURE_OFF); 
 		static char buffer[10];
-		sprintf(buffer, "%.1fX", speed);
+		snprintf(buffer, sizeof(buffer), "%.1fX", speed);
 
 		static Vector fontColor(0.7f, 0.7f, 0.2f);
 		GLWFont::instance()->getLargePtFont()->draw(fontColor, 20, 10.0f, 10.0f, 0.0f, buffer);
Only in scorched/src/client: SpeedChange.cpp~
diff -ur scorched.orig/src/common/ARGParser.cpp scorched/src/common/ARGParser.cpp
--- scorched.orig/src/common/ARGParser.cpp	2005-07-24 21:34:00.000000000 +0200
+++ scorched/src/common/ARGParser.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -102,7 +102,7 @@
 		else
 		{
 			char buffer[255];
-			sprintf(buffer, "ERROR: Unknown parameter : \"%s\"\n\n", firstCommand.c_str());
+			snprintf(buffer, sizeof(buffer), "ERROR: Unknown parameter : \"%s\"\n\n", firstCommand.c_str());
 			showArgs(buffer);
 			return false;
 		}
@@ -249,7 +249,7 @@
 		else if (itor->second.destI || itor->second.destInt) type = "";
 
 		char buffer2[255];
-		sprintf(buffer2, "\t%s %s", itor->first.c_str(), type);
+		snprintf(buffer2, sizeof(buffer2), "\t%s %s", itor->first.c_str(), type);
 		if (itor->second.help.size())
 		{
 			strcat(buffer2, std::string(abs(30 - int(strlen(buffer2))), ' ').c_str());
diff -ur scorched.orig/src/common/Defines.cpp scorched/src/common/Defines.cpp
--- scorched.orig/src/common/Defines.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/common/Defines.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -72,7 +72,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 #ifdef _WIN32
@@ -93,21 +93,14 @@
 
 void dialogAssert(const char *lineText, const int line, const char *file)
 {
-	// Dont use formatString here as this method is called by formatString.
-	char buffer[20048];
-	sprintf(buffer, "%s\n%i:%s", lineText, line, file);
-	dialogMessage("Program Assert", buffer);
+	dialogMessage("Program Assert", "%s\n%i:%s", lineText, line, file);
 	exit(64);
 }
 
 const char *formatStringList(const char *format, va_list ap)
 {
 	static char buffer[20048];
-	buffer[sizeof(buffer) - 1] = '\0';
-	vsprintf(buffer, format, ap);
-	if (buffer[sizeof(buffer) - 1] != 0) 
-		dialogAssert("buffer[sizeof(buffer) - 1] == 0", __LINE__, __FILE__);
-
+	vsnprintf(buffer, sizeof(buffer), format, ap);
 	return buffer;
 }
 
@@ -160,18 +153,20 @@
 	static char buffer[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
-	sprintf(buffer, getModFile("%s/%s", DefinesUtil::getDataFileMod(), filename));
+	snprintf(buffer, sizeof(buffer), "%s",
+		getModFile("%s/%s", DefinesUtil::getDataFileMod(), filename));
 	DefinesUtil::fileDos2Unix(buffer);
 	if (DefinesUtil::fileExists(buffer)) return buffer;
 
-	sprintf(buffer, getGlobalModFile("%s/%s", DefinesUtil::getDataFileMod(), filename));
+	snprintf(buffer, sizeof(buffer), "%s",
+		 getGlobalModFile("%s/%s", DefinesUtil::getDataFileMod(), filename));
 	DefinesUtil::fileDos2Unix(buffer);
 	if (DefinesUtil::fileExists(buffer)) return buffer;
 
-	sprintf(buffer, S3D_DATADIR "/%s", filename);
+	snprintf(buffer, sizeof(buffer), S3D_DATADIR "/%s", filename);
 	DefinesUtil::fileDos2Unix(buffer);
 
 	return buffer;
@@ -182,7 +177,7 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	const char *dataFileName = getDataFile(filename);
@@ -205,9 +200,9 @@
 	static char buffer[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
-	sprintf(buffer, S3D_DOCDIR "/%s", filename);
+	snprintf(buffer, sizeof(buffer), S3D_DOCDIR "/%s", filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -217,7 +212,7 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static std::string homeDir;
@@ -231,7 +226,7 @@
 	}
 
 	static char buffer[1024];
-	sprintf(buffer, "%s/%s", homeDir.c_str(), filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", homeDir.c_str(), filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -242,7 +237,7 @@
 	
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static std::string homeDir;
@@ -261,7 +256,7 @@
 	}
 
 	static char buffer[1024];
-	sprintf(buffer, "%s/%s", homeDir.c_str(), filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", homeDir.c_str(), filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -272,7 +267,7 @@
 	static char buffer[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	const char *homeDirStr = getSettingsFile("");
@@ -280,7 +275,7 @@
 	if (DefinesUtil::dirExists(newDir.c_str())) homeDirStr = newDir.c_str();
 	else if (DefinesUtil::dirMake(newDir.c_str())) homeDirStr = newDir.c_str();
 
-	sprintf(buffer, "%s/%s", homeDirStr, filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", homeDirStr, filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -290,7 +285,7 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static char buffer[1024];
@@ -299,7 +294,7 @@
 	if (DefinesUtil::dirExists(newDir.c_str())) homeDirStr = newDir.c_str();
 	else if (DefinesUtil::dirMake(newDir.c_str())) homeDirStr = newDir.c_str();
 
-	sprintf(buffer, "%s/%s", homeDirStr, filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", homeDirStr, filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -309,7 +304,7 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static std::string modDir;
@@ -324,7 +319,7 @@
 	}
 	         
 	static char buffer[1024];
-	sprintf(buffer, "%s/%s", modDir.c_str(), filename);
+	snprintf(buffer, sizeof(buffer), "%s/%s", modDir.c_str(), filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
@@ -334,11 +329,11 @@
 	static char filename[1024];
 	va_list ap;
 	va_start(ap, file);
-	vsprintf(filename, file, ap);
+	vsnprintf(filename, sizeof(filename), file, ap);
 	va_end(ap);
 
 	static char buffer[1024];
-	sprintf(buffer, S3D_DATADIR "/data/globalmods/%s", filename);
+	snprintf(buffer, sizeof(buffer), S3D_DATADIR "/data/globalmods/%s", filename);
 	DefinesUtil::fileDos2Unix(buffer);
 	return buffer;
 }
diff -ur scorched.orig/src/common/FileLines.cpp scorched/src/common/FileLines.cpp
--- scorched.orig/src/common/FileLines.cpp	2004-11-09 00:43:23.000000000 +0100
+++ scorched/src/common/FileLines.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -96,7 +96,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 	fileLines_.push_back(text);
diff -ur scorched.orig/src/common/Logger.cpp scorched/src/common/Logger.cpp
--- scorched.orig/src/common/Logger.cpp	2005-06-20 02:35:08.000000000 +0200
+++ scorched/src/common/Logger.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -87,7 +87,7 @@
 	static char text[2048];
 	va_list ap;
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 	LoggerInfo info;
diff -ur scorched.orig/src/common/StatsLoggerFile.cpp scorched/src/common/StatsLoggerFile.cpp
--- scorched.orig/src/common/StatsLoggerFile.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/common/StatsLoggerFile.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -124,7 +124,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "fired \"%s\" [%s] \"%s\"", 
+	snprintf(message, sizeof(message), "fired \"%s\" [%s] \"%s\"", 
 		firedTank->getName(), firedTank->getUniqueId(),
 		weapon->getParent()->getName());
 
@@ -143,7 +143,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "resigined \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "resigined \"%s\" [%s]", 
 		resignedTank->getName(), resignedTank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -160,7 +160,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "joined \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "joined \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -177,7 +177,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "connected \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "connected \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -194,7 +194,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "disconnected \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "disconnected \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -211,7 +211,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "killed \"%s\" [%s] \"%s\" [%s] \"%s\"", 
+	snprintf(message, sizeof(message), "killed \"%s\" [%s] \"%s\" [%s] \"%s\"", 
 		firedTank->getName(), firedTank->getUniqueId(),
 		deadTank->getName(), deadTank->getUniqueId(),
 		weapon->getParent()->getName());
@@ -230,7 +230,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "teamkilled \"%s\" [%s] \"%s\" [%s] \"%s\"", 
+	snprintf(message, sizeof(message), "teamkilled \"%s\" [%s] \"%s\" [%s] \"%s\"", 
 		firedTank->getName(), firedTank->getUniqueId(),
 		deadTank->getName(), deadTank->getUniqueId(),
 		weapon->getParent()->getName());
@@ -249,7 +249,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "selfkilled \"%s\" [%s] \"%s\"", 
+	snprintf(message, sizeof(message), "selfkilled \"%s\" [%s] \"%s\"", 
 		firedTank->getName(), firedTank->getUniqueId(),
 		weapon->getParent()->getName());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
@@ -267,7 +267,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "won \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "won \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -284,7 +284,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "overallwinner \"%s\" [%s]", 
+	snprintf(message, sizeof(message), "overallwinner \"%s\" [%s]", 
 		tank->getName(), tank->getUniqueId());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
@@ -301,7 +301,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "weaponfired \"%s\"", weapon->getParent()->getName());
+	snprintf(message, sizeof(message), "weaponfired \"%s\"", weapon->getParent()->getName());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
 }
@@ -317,7 +317,7 @@
 	if (nl) *nl = '\0';
 
 	char message[1024];
-	sprintf(message, "weaponkilled \"%s\"", weapon->getParent()->getName());
+	snprintf(message, sizeof(message), "weaponkilled \"%s\"", weapon->getParent()->getName());
 	LoggerInfo info(LoggerInfo::TypeNormal, message, time);
 	statsLogger_->logMessage(info);
 }
diff -ur scorched.orig/src/common/StatsLoggerMySQL.cpp scorched/src/common/StatsLoggerMySQL.cpp
--- scorched.orig/src/common/StatsLoggerMySQL.cpp	2005-08-08 11:37:24.000000000 +0200
+++ scorched/src/common/StatsLoggerMySQL.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -63,7 +63,7 @@
 	static char text[50000];
 	va_list ap;
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 	return (mysql_real_query(mysql_, text, strlen(text)) == 0);
diff -ur scorched.orig/src/coms/ComsConnectMessage.h scorched/src/coms/ComsConnectMessage.h
--- scorched.orig/src/coms/ComsConnectMessage.h	2005-07-21 22:34:24.000000000 +0200
+++ scorched/src/coms/ComsConnectMessage.h	2006-02-11 15:02:03.000000000 +0100
@@ -47,7 +47,7 @@
 	void setUniqueId(const char *uid) { setValue("uid", uid); }
 	void setHostDesc(const char *host) { setValue("host", host); }
 	void setNoPlayers(unsigned int players) { 
-		char buf[10]; sprintf(buf, "%i", players); setValue("numplayers", buf); }
+		char buf[11]; sprintf(buf, "%u", players); setValue("numplayers", buf); }
 
 	const char *getVersion() { return getValue("version"); }
 	const char *getProtocolVersion() { return getValue("pversion"); }
diff -ur scorched.orig/src/coms/ComsMessageHandler.cpp scorched/src/coms/ComsMessageHandler.cpp
--- scorched.orig/src/coms/ComsMessageHandler.cpp	2005-04-05 00:35:25.000000000 +0200
+++ scorched/src/coms/ComsMessageHandler.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -114,7 +114,8 @@
 	if (itor == handlerMap_.end())
 	{
 		char buffer[1024];
-		sprintf(buffer, "Failed to find message type handler \"%s\"",
+		snprintf(buffer, sizeof(buffer),
+			"Failed to find message type handler \"%s\"",
 			messageType.c_str());
 
 		if (connectionHandler_)
@@ -129,7 +130,8 @@
 		messageTypeStr, reader))
 	{
 		char buffer[1024];
-		sprintf(buffer, "Failed to handle message type \"%s\"",
+		snprintf(buffer, sizeof(buffer),
+			"Failed to handle message type \"%s\"",
 			messageType.c_str());
 
 		if (connectionHandler_)
diff -ur scorched.orig/src/dialogs/AutoDefenseDialog.cpp scorched/src/dialogs/AutoDefenseDialog.cpp
--- scorched.orig/src/dialogs/AutoDefenseDialog.cpp	2005-07-19 23:45:36.000000000 +0200
+++ scorched/src/dialogs/AutoDefenseDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -173,13 +173,13 @@
 		char buffer[256];
 		if (shieldcount > 0)
 		{
-			sprintf(buffer, "%s (%i)",
+			snprintf(buffer, sizeof(buffer), "%s (%i)",
 				shield->getName(),
 				shieldcount);
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)",
+			snprintf(buffer, sizeof(buffer), "%s (In)",
 				shield->getName());
 		}
 		ddshields_->addText(GLWSelectorEntry(buffer,
@@ -215,13 +215,13 @@
 		char buffer[256];
 		if (tank->getAccessories().getShields().getShieldCount(currentShield) > 0)
 		{
-			sprintf(buffer, "%s (%i)",
+			snprintf(buffer, sizeof(buffer), "%s (%i)",
 				currentShield->getName(),
 				tank->getAccessories().getShields().getShieldCount(currentShield));
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)",
+			snprintf(buffer, sizeof(buffer), "%s (In)",
 				currentShield->getName());
 		}
 		ddshields_->setText(buffer);
diff -ur scorched.orig/src/ode/error.cpp scorched/src/ode/error.cpp
--- scorched.orig/src/ode/error.cpp	2004-09-15 00:10:04.000000000 +0200
+++ scorched/src/ode/error.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -129,7 +129,7 @@
   else {
     char s[1000],title[100];
     sprintf (title,"ODE Error %d",num);
-    vsprintf (s,msg,ap);
+    vsnprintf (s,sizeof(s),msg,ap);
     s[sizeof(s)-1] = 0;
     MessageBox(0,s,title,MB_OK | MB_ICONWARNING);
   }
@@ -145,7 +145,7 @@
   else {
     char s[1000],title[100];
     sprintf (title,"ODE INTERNAL ERROR %d",num);
-    vsprintf (s,msg,ap);
+    vsnprintf (s,sizeof(s),msg,ap);
     s[sizeof(s)-1] = 0;
     MessageBox(0,s,title,MB_OK | MB_ICONSTOP);
   }
diff -ur scorched.orig/src/ode/testing.cpp scorched/src/ode/testing.cpp
--- scorched.orig/src/ode/testing.cpp	2003-07-10 18:30:19.000000000 +0200
+++ scorched/src/ode/testing.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -72,7 +72,7 @@
 
     va_list ap;
     va_start (ap,name);
-    vsprintf (mi->name,name,ap);
+    vsnprintf (mi->name, sizeof(mi->name), name, ap);
     if (strlen(mi->name) >= sizeof (mi->name)) dDebug (0,"name too long");
 
     mat.push (mi);
@@ -88,7 +88,7 @@
     dMatInfo mi;
     va_list ap;
     va_start (ap,name);
-    vsprintf (mi.name,name,ap);
+    vsnprintf (mi.name, sizeof(mi.name), name, ap);
     if (strlen(mi.name) >= sizeof (mi.name)) dDebug (0,"name too long");
 
     if (strcmp(mp->name,mi.name) != 0)
diff -ur scorched.orig/src/scorched/DisplayDialog.cpp scorched/src/scorched/DisplayDialog.cpp
--- scorched.orig/src/scorched/DisplayDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/DisplayDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -265,8 +265,8 @@
 			const char *stateName = "";
 			KeyboardKey::translateKeyNameValue(key->getKeys()[position].key, keyName);
 			KeyboardKey::translateKeyStateValue(key->getKeys()[position].state, stateName);
-			if (strcmp(stateName, "NONE") == 0) sprintf(buffer, "%s", keyName);
-			else sprintf(buffer, "<%s> %s", stateName, keyName);
+			if (strcmp(stateName, "NONE") == 0) snprintf(buffer, sizeof(buffer), "%s", keyName);
+			else snprintf(buffer, sizeof(buffer), "<%s> %s", stateName, keyName);
 		}
 		button->SetLabel(wxString(buffer, wxConvUTF8));
 	}
diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
--- scorched.orig/src/scorched/MainDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -143,11 +143,11 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);
 
 	char path[1024];
-	sprintf(path, "%s %s", exeName, text);
+	snprintf(path, sizeof(path), "%s %s", exeName, text);
 
 	ScorchedProcess *process = new ScorchedProcess();
 	long result = ::wxExecute(wxString(path, wxConvUTF8), wxEXEC_ASYNC, process);
diff -ur scorched.orig/src/scorched/NetDialog.cpp scorched/src/scorched/NetDialog.cpp
--- scorched.orig/src/scorched/NetDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/NetDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -127,7 +127,7 @@
 				ServerBrowser::instance()->getServerList().
 					getEntryValue(item, "maxplayers");
 			char text[256];
-			sprintf(text, "%s/%s", clients.c_str(), maxclients.c_str());
+			snprintf(text, sizeof(text), "%s/%s", clients.c_str(), maxclients.c_str());
 
 			return wxString(text, wxConvUTF8);
 		}
@@ -498,7 +498,7 @@
 		wxString username = IDC_EDIT_NAME_CTRL->GetValue();
 
 		char buffer[1024];
-		sprintf(buffer, "-connect \"%s\"", (const char *) value.mb_str(wxConvUTF8));
+		snprintf(buffer, sizeof(buffer), "-connect \"%s\"", (const char *) value.mb_str(wxConvUTF8));
 
 		if (!password.empty())
 		{
diff -ur scorched.orig/src/scorched/ServerDialog.cpp scorched/src/scorched/ServerDialog.cpp
--- scorched.orig/src/scorched/ServerDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/ServerDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -402,7 +402,7 @@
 	{
 		TankAI *ai = (*aiitor);
 		char buffer[256];
-		sprintf(buffer, "Add %s", ai->getName());
+		snprintf(buffer, sizeof(buffer), "Add %s", ai->getName());
 		menuAddPlayer->Append(IDC_MENU_PLAYERADD_1 + aicount, wxString(buffer, wxConvUTF8));
 	}
 
@@ -841,7 +841,8 @@
 void showServerDialog()
 {
 	char serverName[1024];
-	sprintf(serverName, "Scorched 3D Dedicated Server [ %s : %i ] [%s]",
+	snprintf(serverName, sizeof(serverName),
+			"Scorched 3D Dedicated Server [ %s : %i ] [%s]",
 			ScorchedServer::instance()->getOptionsGame().getServerName(), 
 			ScorchedServer::instance()->getOptionsGame().getPortNo(), 
 			(ScorchedServer::instance()->getOptionsGame().getPublishServer()?"Published":"Not Published"));
diff -ur scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
--- scorched.orig/src/scorched/SettingsDialog.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/SettingsDialog.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -417,7 +417,7 @@
 			(void *) (OptionsGame::WindRandom));
 		for (int i=0; i<=5; i++)
 		{
-			char buffer[25];
+			char buffer[30];
 			sprintf(buffer, "Force %i%s", i, ((i==0)?" (No Wind)":""));
 			SettingsEnv::IDC_COMBO_FORCE_CTRL->Append(
 				wxString(buffer, wxConvUTF8), (void *) (i+1));
@@ -471,7 +471,7 @@
 		for (int i=0; i<=20; i++)
 		{
 			char buffer[25];
-			sprintf(buffer, "%i", i, i);
+			sprintf(buffer, "%i", i);
 			if (i<=10)
 			{
 				SettingsEnv::IDC_COMBO_STARTARMSLEVEL_CTRL->Append(wxString(buffer, wxConvUTF8), (void *) i);
Only in scorched/src/scorched: SingleChoiceDialog.cpp.orig
diff -ur scorched.orig/src/scorched/main.cpp scorched/src/scorched/main.cpp
--- scorched.orig/src/scorched/main.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/scorched/main.cpp	2006-02-11 15:06:24.000000000 +0100
@@ -145,7 +145,8 @@
 int main(int argc, char *argv[])
 {
 	// Generate the version
-	sprintf(scorched3dAppName, "Scorched3D - Version %s (%s)", 
+	snprintf(scorched3dAppName, sizeof(scorched3dAppName),
+		"Scorched3D - Version %s (%s)", 
 		ScorchedVersion, ScorchedProtocolVersion);
 
 	srand((unsigned)time(0));
Only in scorched/src/scorched: main.cpp~
diff -ur scorched.orig/src/server/ServerBrowserInfo.cpp scorched/src/server/ServerBrowserInfo.cpp
--- scorched.orig/src/server/ServerBrowserInfo.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/server/ServerBrowserInfo.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -138,7 +138,7 @@
 {
 	char *serverName = (char *) ScorchedServer::instance()->getOptionsGame().getServerName();
 	char version[256];
-	sprintf(version, "%s (%s)", ScorchedVersion, ScorchedProtocolVersion);
+	snprintf(version, sizeof(version), "%s (%s)", ScorchedVersion, ScorchedProtocolVersion);
 	unsigned currentState = ScorchedServer::instance()->getGameState().getState();
 	bool started = !ServerTooFewPlayersStimulus::instance()->acceptStateChange(0, 0, 0.0f);
 	char players[25];
@@ -146,7 +146,7 @@
 	char maxplayers[25];
 	sprintf(maxplayers, "%i", ScorchedServer::instance()->getOptionsGame().getNoMaxPlayers());
 	char type[100];
-	sprintf(type, "%s (%s)", 
+	snprintf(type, sizeof(type), "%s (%s)", 
 		ScorchedServer::instance()->getOptionsTransient().getGameType(),
 		((ScorchedServer::instance()->getOptionsGame().getTeams() > 1)?"Teams":"No Teams"));
 	wxString osDesc = ::wxGetOsDescription();
diff -ur scorched.orig/src/server/ServerCommon.cpp scorched/src/server/ServerCommon.cpp
--- scorched.orig/src/server/ServerCommon.cpp	2005-08-14 21:11:42.000000000 +0200
+++ scorched/src/server/ServerCommon.cpp	2006-02-11 15:12:42.000000000 +0100
@@ -63,7 +63,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	ComsTextMessage message(text, 0, true);
@@ -83,7 +83,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	ComsTextMessage message(text);
@@ -104,7 +104,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
-	vsprintf(text, fmt, ap);
+	vsnprintf(text, sizeof(text), fmt, ap);
 	va_end(ap);	
 
 	std::map &tanks = 
@@ -295,7 +295,7 @@
 		// Add the actual log message
 		va_list ap;
 		va_start(ap, fmt);
-		vsprintf(text, fmt, ap);
+		vsnprintf(text, sizeof(text), fmt, ap);
 		va_end(ap);
 
 		Logger::log(text);
Only in scorched/src/server: ServerCommon.cpp~
diff -ur scorched.orig/src/server/ServerRegistration.cpp scorched/src/server/ServerRegistration.cpp
--- scorched.orig/src/server/ServerRegistration.cpp	2005-06-08 19:29:38.000000000 +0200
+++ scorched/src/server/ServerRegistration.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -39,7 +39,7 @@
 	netServer_(new NetServerHTTPProtocolSend)
 {
 	static char buffer[1024];
-	sprintf(buffer, 
+	snprintf(buffer, sizeof(buffer),
 		"GET %s/servers.php?register=%s&port=%i HTTP/1.0\r\n"
 		"User-Agent: Scorched3D\r\n"
 		"Host: %s\r\n"
diff -ur scorched.orig/src/tank/TankPhysics.cpp scorched/src/tank/TankPhysics.cpp
--- scorched.orig/src/tank/TankPhysics.cpp	2005-06-11 18:53:41.000000000 +0200
+++ scorched/src/tank/TankPhysics.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -248,13 +248,13 @@
 
 	if (OptionsDisplay::instance()->getUseHexidecimal())
 	{
-		sprintf(messageBuffer, "0x%x (0x%x)", 
+		snprintf(messageBuffer, sizeof(messageBuffer), "0x%x (0x%x)", 
 				int(360.0f - getRotationGunXY()),
 				int(rotDiff));
 	}
 	else
 	{
-		sprintf(messageBuffer, "%.1f (%+.1f)", 
+		snprintf(messageBuffer, sizeof(messageBuffer), "%.1f (%+.1f)", 
 				360.0f - getRotationGunXY(),
 				rotDiff);
 	}
@@ -269,13 +269,13 @@
 
 	if (OptionsDisplay::instance()->getUseHexidecimal())
 	{
-		sprintf(messageBuffer, "0x%x (0X%x)", 
+		snprintf(messageBuffer, sizeof(messageBuffer), "0x%x (0X%x)", 
 				int(getRotationGunYZ()),
 				int(rotDiff));
 	}
 	else
 	{
-		sprintf(messageBuffer, "%.1f (%+.1f)", 
+		snprintf(messageBuffer, sizeof(messageBuffer), "%.1f (%+.1f)", 
 				getRotationGunYZ(),
 				rotDiff);
 	}
@@ -289,13 +289,13 @@
 
 	if (OptionsDisplay::instance()->getUseHexidecimal())
 	{
-		sprintf(messageBuffer, "0X%x (0X%x)", 		
+		snprintf(messageBuffer, sizeof(messageBuffer), "0X%x (0X%x)", 		
 				int(getPower()),
 				int(powDiff));
 	}
 	else
 	{
-		sprintf(messageBuffer, "%.1f (%+.1f)", 		
+		snprintf(messageBuffer, sizeof(messageBuffer), "%.1f (%+.1f)", 		
 				getPower(),
 				powDiff);
 	}
diff -ur scorched.orig/src/tank/TankState.cpp scorched/src/tank/TankState.cpp
--- scorched.orig/src/tank/TankState.cpp	2005-07-17 13:32:05.000000000 +0200
+++ scorched/src/tank/TankState.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -88,7 +88,7 @@
 const char *TankState::getStateString()
 {
 	static char string[1024];
-	sprintf(string, "%s - %s %s(%i hp)",
+	snprintf(string, sizeof(string), "%s - %s %s(%i hp)",
 		((readyState_==sReady)?"Rdy":"Wait"),
 		getSmallStateString(),
 		(muted_?"muted ":""),
diff -ur scorched.orig/src/tank/TankWeapon.cpp scorched/src/tank/TankWeapon.cpp
--- scorched.orig/src/tank/TankWeapon.cpp	2005-07-27 01:51:21.000000000 +0200
+++ scorched/src/tank/TankWeapon.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -206,7 +206,7 @@
 {
 	static char buffer[256];
 	int count = getWeaponCount(getCurrent());
-	sprintf(buffer, ((count>0)?"%s (%i)":"%s (In)"),
+	snprintf(buffer, sizeof(buffer), ((count>0)?"%s (%i)":"%s (In)"),
 		getCurrent()->getName(), count);
 	return buffer;
 }
diff -ur scorched.orig/src/tankai/TankAIAdder.cpp scorched/src/tankai/TankAIAdder.cpp
--- scorched.orig/src/tankai/TankAIAdder.cpp	2005-04-05 00:35:25.000000000 +0200
+++ scorched/src/tankai/TankAIAdder.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -72,7 +72,7 @@
 		char uniqueId[256];
 		{
 			std::set usedIds;
-			sprintf(uniqueId, "%s - computer - %%i", aiName);
+			snprintf(uniqueId, sizeof(uniqueId), "%s - computer - %%i", aiName);
 			std::map &playingTanks = 
 				context.getTankContainer().getPlayingTanks();
 			std::map::iterator playingItor;
@@ -94,7 +94,7 @@
 			int uniqueIdCount = 1;
 			while (usedIds.find(uniqueIdCount) != usedIds.end()) uniqueIdCount++;
 
-			sprintf(uniqueId, "%s - computer - %i", aiName, uniqueIdCount);
+			snprintf(uniqueId, sizeof(uniqueId), "%s - computer - %i", aiName, uniqueIdCount);
 		}
 
 		std::string newname = name;
diff -ur scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
--- scorched.orig/src/tankgraph/GLWTankTip.cpp	2006-02-11 15:02:47.000000000 +0100
+++ scorched/src/tankgraph/GLWTankTip.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -50,7 +50,7 @@
 	for (int i=0; i<(int) oldShots.size(); i++)
 	{
 		char buffer[128];
-		sprintf(buffer, "%s%i: Pwr:%.1f Ele:%.1f Rot:%.1f",
+		snprintf(buffer, sizeof(buffer), "%s%i: Pwr:%.1f Ele:%.1f Rot:%.1f",
 			(oldShots[i].current?"* ":"  "),
 			i, oldShots[i].power, oldShots[i].ele,
 			(360.0f - oldShots[i].rot));
@@ -211,13 +211,13 @@
 		char buffer[128];
 		if (count >= 0)
 		{
-			sprintf(buffer, "%s (%i)", 
+			snprintf(buffer, sizeof(buffer), "%s (%i)", 
 				current->getName(),
 				count);
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)",
+			snprintf(buffer, sizeof(buffer), "%s (In)",
 				current->getName());
 		}
 		entries.push_back(GLWSelectorEntry(buffer, ¤t->getToolTip(), 
@@ -432,13 +432,13 @@
 		char buffer[128];
 		if (count > 0)
 		{
-			sprintf(buffer, "%s (%i)", 
+			snprintf(buffer, sizeof(buffer), "%s (%i)", 
 				weapon->getName(),
 				count);
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)", 
+			snprintf(buffer, sizeof(buffer), "%s (In)", 
 				weapon->getName());
 		}
 		entries.push_back(GLWSelectorEntry(buffer, &weapon->getToolTip(), 
diff -ur scorched.orig/src/tankgraph/TankMenus.cpp scorched/src/tankgraph/TankMenus.cpp
--- scorched.orig/src/tankgraph/TankMenus.cpp	2005-07-19 23:45:37.000000000 +0200
+++ scorched/src/tankgraph/TankMenus.cpp	2006-02-11 15:02:03.000000000 +0100
@@ -193,7 +193,7 @@
 		}
 
 		char buffer[1024];
-		sprintf(buffer, "%c %8s - \"%10s\" (%s)", 
+		snprintf(buffer, 1024, "%c %8s - \"%10s\" (%s)", 
 			currentTank == tank?'>':' ',
 			description,
 			tank->getName(), modelId.getModelName());
@@ -394,12 +394,12 @@
 		static char buffer[1024];
 		if (accessoryCount > 0)
 		{
-			sprintf(buffer, "%s (%i)", 
+			snprintf(buffer, sizeof(buffer), "%s (%i)", 
 				accessory->getName(), accessoryCount);
 		}
 		else
 		{
-			sprintf(buffer, "%s (In)", 
+			snprintf(buffer, sizeof(buffer), "%s (In)", 
 				accessory->getName());
 		}
 		menuItems_.push_back(accessory);

scorched3d-strxxx.patch:

--- NEW FILE scorched3d-strxxx.patch ---
Only in scorched: aap
diff -ur scorched.orig/src/3dsparse/MSModelFactory.cpp scorched/src/3dsparse/MSModelFactory.cpp
--- scorched.orig/src/3dsparse/MSModelFactory.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/3dsparse/MSModelFactory.cpp	2006-02-11 16:10:25.000000000 +0100
@@ -80,7 +80,7 @@
 void MSModelFactory::loadFile(FILE *in, const char *fileName, Model *model)
 {
 	char filePath[256];
-	strcpy(filePath, fileName);
+	snprintf(filePath, sizeof(filePath), "%s", fileName);
 
 	char *sep;
 	while (sep=strchr(filePath, '\\')) *sep = '/';
diff -ur scorched.orig/src/3dsparse/aseFile.lex.cpp scorched/src/3dsparse/aseFile.lex.cpp
--- scorched.orig/src/3dsparse/aseFile.lex.cpp	2004-03-01 18:48:17.000000000 +0100
+++ scorched/src/3dsparse/aseFile.lex.cpp	2006-02-11 16:13:01.000000000 +0100
@@ -873,7 +873,7 @@
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-{ strcpy(aseString, asetext ); return MAX_STRING; }
+{ snprintf(aseString, sizeof(aseString), "%s", asetext ); return MAX_STRING; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
Only in scorched/src/3dsparse: aseFile.lex.cpp~
diff -ur scorched.orig/src/GLEXT/GLConsoleRules.cpp scorched/src/GLEXT/GLConsoleRules.cpp
--- scorched.orig/src/GLEXT/GLConsoleRules.cpp	2003-08-01 00:37:11.000000000 +0200
+++ scorched/src/GLEXT/GLConsoleRules.cpp	2006-02-11 16:22:14.000000000 +0100
@@ -73,7 +73,7 @@
 	if (matches.size() == 1) return matches.front()->getName();
 
 	static char buffer[1024];
-	strcpy(buffer, line);
+	snprintf(buffer, sizeof(buffer), "%s", line);
 
 	int pos = (int) strlen(line);
 	while (true)
Only in scorched/src/GLEXT: GLConsoleRules.cpp~
diff -ur scorched.orig/src/GLEXT/GLState.cpp scorched/src/GLEXT/GLState.cpp
--- scorched.orig/src/GLEXT/GLState.cpp	2004-09-07 14:29:13.000000000 +0200
+++ scorched/src/GLEXT/GLState.cpp	2006-02-11 16:29:28.000000000 +0100
@@ -105,15 +105,16 @@
 {
 	static char buffer[1024];
 	buffer[0] = '\0';
-
-	if (currentState_ & TEXTURE_ON) strcat(buffer, "TEXTURE_ON\n");
-	if (currentState_ & TEXTURE_OFF) strcat(buffer, "TEXTURE_ON\n");
-	if (currentState_ & DEPTH_ON) strcat(buffer, "DEPTH_ON\n");
-	if (currentState_ & DEPTH_OFF) strcat(buffer, "DEPTH_OFF\n");
-	if (currentState_ & BLEND_ON) strcat(buffer, "BLEND_ON\n");
-	if (currentState_ & BLEND_OFF) strcat(buffer, "BLEND_OFF\n");
-	if (currentState_ & CUBEMAP_ON) strcat(buffer, "CUBEMAP_ON\n");
-	if (currentState_ & CUBEMAP_OFF) strcat(buffer, "CUBEMAP_OFF\n");
+	
+	snprintf(buffer, sizeof(buffer), "%s%s%s%s%s%s%s%s",
+		(currentState_ & TEXTURE_ON)? "TEXTURE_ON\n":"",
+		(currentState_ & TEXTURE_OFF)? "TEXTURE_ON\n":"",
+		(currentState_ & DEPTH_ON)? "DEPTH_ON\n":"",
+		(currentState_ & DEPTH_OFF)? "DEPTH_OFF\n":"",
+		(currentState_ & BLEND_ON)? "BLEND_ON\n":"",
+		(currentState_ & BLEND_OFF)? "BLEND_OFF\n":"",
+		(currentState_ & CUBEMAP_ON)? "CUBEMAP_ON\n":"",
+		(currentState_ & CUBEMAP_OFF)? "CUBEMAP_OFF\n":"");
 
 	return buffer;
 }
Only in scorched/src/GLEXT: GLState.cpp~
diff -ur scorched.orig/src/client/ServerBrowserRefresh.cpp scorched/src/client/ServerBrowserRefresh.cpp
--- scorched.orig/src/client/ServerBrowserRefresh.cpp	2003-10-17 12:38:00.000000000 +0200
+++ scorched/src/client/ServerBrowserRefresh.cpp	2006-02-11 16:15:52.000000000 +0100
@@ -72,7 +72,7 @@
 	if (!name[0]) return;
 
 	static char buffer[256];
-	strcpy(buffer, name);
+	snprintf(buffer, sizeof(buffer), "%s", name);
 	char *port = strchr(buffer, ':');
 	if (!port) return;
 	*port = '\0';
Only in scorched/src/client: ServerBrowserRefresh.cpp~
diff -ur scorched.orig/src/client/ServerBrowserServerList.cpp scorched/src/client/ServerBrowserServerList.cpp
--- scorched.orig/src/client/ServerBrowserServerList.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/client/ServerBrowserServerList.cpp	2006-02-11 16:13:53.000000000 +0100
@@ -239,7 +239,7 @@
 	SDL_LockMutex(vectorMutex_);
 	ServerBrowserEntry &entry = getEntry(pos);
 	static char buffer[256];
-	strcpy(buffer, entry.getAttribute(name));
+	snprintf(buffer, sizeof(buffer), "%s", entry.getAttribute(name));
 	SDL_UnlockMutex(vectorMutex_);
 
 	return buffer;
diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
--- scorched.orig/src/scorched/MainDialog.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/scorched/MainDialog.cpp	2006-02-11 16:17:37.000000000 +0100
@@ -77,11 +77,8 @@
 
 void setExeName(const char *name, bool allowExceptions)
 {
-	strcpy(exeName, name);
-	if (allowExceptions)
-	{
-		strcat(exeName, " -allowexceptions");
-	}
+	snprintf(exeName, sizeof(exeName), "%s%s", name,
+		allowExceptions? " -allowexceptions":"");
 }
 
 static SDL_mutex *messageMutex_ = 0;
diff -ur scorched.orig/src/scorched/main.cpp scorched/src/scorched/main.cpp
--- scorched.orig/src/scorched/main.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/scorched/main.cpp	2006-02-11 16:18:13.000000000 +0100
@@ -159,7 +159,7 @@
 	{
 		// Perhaps we can get the directory from the executables path name
 		char path[1024];
-		strcpy(path, argv[0]);
+		snprintf(path, sizeof(path), "%s", argv[0]);
 		char *sep = strrchr(path, '/');
 		if (sep)
 		{
diff -ur scorched.orig/src/server/ServerBrowserInfo.cpp scorched/src/server/ServerBrowserInfo.cpp
--- scorched.orig/src/server/ServerBrowserInfo.cpp	2006-02-11 15:32:18.000000000 +0100
+++ scorched/src/server/ServerBrowserInfo.cpp	2006-02-11 16:21:52.000000000 +0100
@@ -232,7 +232,7 @@
 {
 	static char buffer[10000];
 	static char newvalue[10000];
-	strcpy(newvalue, value);
+	snprintf(newvalue, sizeof(newvalue), "%s", value);
 	for (char *a=newvalue; *a; a++)
 	{
 		if (*a == '\'') *a='\"';
@@ -240,7 +240,6 @@
 		else if (*a == '<') *a=' ';
 	}
 
-	strcpy(buffer, name); strcat(buffer, "='");
-	strcat(buffer, newvalue); strcat(buffer, "' ");
+	snprintf(buffer, sizeof(buffer), "%s='%s' ", name, newvalue);
 	return buffer;
 }
diff -ur scorched.orig/src/skincreator/main.cpp scorched/src/skincreator/main.cpp
--- scorched.orig/src/skincreator/main.cpp	2003-08-31 13:30:48.000000000 +0200
+++ scorched/src/skincreator/main.cpp	2006-02-11 16:22:37.000000000 +0100
@@ -62,7 +62,7 @@
 	GLBitmap bitmap;
 	bitmap.grabScreen();
 	char buffer[1024];
-	strcpy(buffer, argv[1]);
+	snprintf(buffer, sizeof(buffer), "%s", argv[1]);
 	char *pos = strrchr(buffer, '.');
 	if (pos)
 	{
--- scorched/src/dialogs/ScoreDialog.cpp~	2006-02-11 20:05:20.000000000 +0100
+++ scorched/src/dialogs/ScoreDialog.cpp	2006-02-11 20:05:20.000000000 +0100
@@ -347,7 +347,8 @@
 
 	// Form the name
 	static char name[256];
-	strcpy(name, current->getName());
+	// Max strcat usage 12
+	snprintf(name, sizeof(name) - 12, "%s", current->getName());
 	if (finished && ! OptionsParam::instance()->getConnectedToServer())
 	{
 		strcat(name, " (");



From fedora-extras-commits at redhat.com  Tue Feb 14 22:10:07 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 14 Feb 2006 17:10:07 -0500
Subject: rpms/apcupsd/FC-4 .cvsignore, 1.3, 1.4 apcupsd.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200602142210.k1EMAgVU030871@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
- Update to 3.12.2
- Don't strip binaries



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jan 2006 17:04:57 -0000	1.3
+++ .cvsignore	14 Feb 2006 22:10:07 -0000	1.4
@@ -1 +1 @@
-apcupsd-3.12.1.tar.gz
+apcupsd-3.12.2.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/apcupsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apcupsd.spec	10 Jan 2006 17:04:57 -0000	1.4
+++ apcupsd.spec	14 Feb 2006 22:10:07 -0000	1.5
@@ -1,5 +1,5 @@
 Name:         apcupsd
-Version:      3.12.1
+Version:      3.12.2
 Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
@@ -44,7 +44,8 @@
 %setup -q
 %patch -p1 -b .init
 dos2unix examples/*status examples/*.c
-
+# Don't strip binaries
+sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in
 
 %build
 %configure \
@@ -142,6 +143,10 @@
 
 
 %changelog
+* Tue Feb 14 2006 - Orion Poplawski  - 3.12.2-1
+- Update to 3.12.2
+- Don't strip binaries
+
 * Tue Jan 10 2006 - Orion Poplawski  - 3.12.1-1
 - Update to 3.12.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 17:04:57 -0000	1.3
+++ sources	14 Feb 2006 22:10:07 -0000	1.4
@@ -1 +1 @@
-d2e710176430a28d624500e145d9ffe3  apcupsd-3.12.1.tar.gz
+f771fafbc06551e7820bd3d277b5cce3  apcupsd-3.12.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 22:11:15 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Feb 2006 17:11:15 -0500
Subject: rpms/scorched3d/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200602142211.k1EMBm3R030942@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources 
Log Message:
new sources for scorched3d 39.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:20:12 -0000	1.2
+++ .cvsignore	14 Feb 2006 22:11:15 -0000	1.3
@@ -1,2 +1 @@
-Scorched3D-37.2-datafix.zip
-Scorched3D-37.2-src.tar.bz2
+Scorched3D-39.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:20:12 -0000	1.2
+++ sources	14 Feb 2006 22:11:15 -0000	1.3
@@ -1,2 +1 @@
-7960b554ebfabf30b5fd5b366b1a4ec5  Scorched3D-37.2-datafix.zip
-f506eabb8b32921a72b2e9040061799b  Scorched3D-37.2-src.tar.bz2
+b5d4600ff77e8e1ba2848ef400ae76eb  Scorched3D-39.1-src.tar.gz



From fedora-extras-commits at redhat.com  Tue Feb 14 22:53:50 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 17:53:50 -0500
Subject: rpms/lock-keys-applet/devel lock-keys-applet-1.0-autotools.patch,
	NONE, 1.1 lock-keys-applet.spec, 1.12, 1.13
Message-ID: <200602142254.k1EMsMOW031605@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/lock-keys-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31579

Modified Files:
	lock-keys-applet.spec 
Added Files:
	lock-keys-applet-1.0-autotools.patch 
Log Message:
Sloppy...

lock-keys-applet-1.0-autotools.patch:

--- NEW FILE lock-keys-applet-1.0-autotools.patch ---
--- lock-keys-applet-1.0/configure.in.autotools	2006-02-14 17:49:53.000000000 -0500
+++ lock-keys-applet-1.0/configure.in	2006-02-14 17:50:02.000000000 -0500
@@ -31,7 +31,7 @@
 AC_OUTPUT([
 Makefile
 src/Makefile
-po/Makefile.in
+po/Makefile
 pixmaps/Makefile
 docs/Makefile
 docs/C/Makefile


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/lock-keys-applet/devel/lock-keys-applet.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lock-keys-applet.spec	14 Feb 2006 05:01:57 -0000	1.12
+++ lock-keys-applet.spec	14 Feb 2006 22:53:50 -0000	1.13
@@ -7,6 +7,7 @@
 License:        GPL
 URL:            http://mfcn.ilo.de/led_applet/
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
+Patch:          lock-keys-applet-1.0-autotools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel gnome-panel-devel scrollkeeper libtool automake autoconf
 Requires(post): scrollkeeper
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .autotools
 
 %build
 %ifnarch %{ix86}



From fedora-extras-commits at redhat.com  Tue Feb 14 23:21:01 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 14 Feb 2006 18:21:01 -0500
Subject: rpms/nethack/devel nethack.spec,1.10,1.11
Message-ID: <200602142321.k1ENLXiC001114@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Log Message:
rebuild


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nethack.spec	27 Dec 2005 17:40:56 -0000	1.10
+++ nethack.spec	14 Feb 2006 23:21:01 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Luke Macken  3.4.3-7
+- Rebuild for FE5
+
 * Tue Dec 27 2005 Luke Macken  3.4.3-6
 - Rebuild
 



From fedora-extras-commits at redhat.com  Wed Feb 15 01:03:05 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 14 Feb 2006 20:03:05 -0500
Subject: rpms/regexxer/devel regexxer.spec,1.2,1.3
Message-ID: <200602150103.k1F13cDV005174@cvs-int.fedora.redhat.com>

Author: cwickert

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

Modified Files:
	regexxer.spec 
Log Message:
Rebuild for Fedora Extras 5


Index: regexxer.spec
===================================================================
RCS file: /cvs/extras/rpms/regexxer/devel/regexxer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- regexxer.spec	28 Sep 2005 14:21:54 -0000	1.2
+++ regexxer.spec	15 Feb 2006 01:03:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           regexxer
 Version:        0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A nifty GUI search/replace tool
 
 Group:          Applications/Text
@@ -84,9 +84,12 @@
 
 
 %changelog
-* Wed Sep 23 2005 Christoph Wickert  - 0.8-2
+* Wed Feb 15 2005 Christoph Wickert  - 0.8.3
+- Rebuild for Fedora Extras 5.
+
+* Wed Sep 23 2005 Christoph Wickert  - 0.8-2
 - Removed hardcoded dependency on gconfmm26.
 - Remoded duplicate BuildRequires gtkmm24-devel.
 
-* Thu Sep 22 2005 Christoph Wickert  - 0.8-1
+* Thu Sep 22 2005 Christoph Wickert  - 0.8-1
 - Initial RPM release.



From fedora-extras-commits at redhat.com  Wed Feb 15 01:05:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 14 Feb 2006 20:05:36 -0500
Subject: rpms/regexxer/devel regexxer.spec,1.3,1.4
Message-ID: <200602150106.k1F16XqO005266@cvs-int.fedora.redhat.com>

Author: cwickert

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

Modified Files:
	regexxer.spec 
Log Message:
Fix year in changelog. I'm still stuck in 2005


Index: regexxer.spec
===================================================================
RCS file: /cvs/extras/rpms/regexxer/devel/regexxer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- regexxer.spec	15 Feb 2006 01:03:04 -0000	1.3
+++ regexxer.spec	15 Feb 2006 01:05:35 -0000	1.4
@@ -84,7 +84,7 @@
 
 
 %changelog
-* Wed Feb 15 2005 Christoph Wickert  - 0.8.3
+* Wed Feb 15 2006 Christoph Wickert  - 0.8.3
 - Rebuild for Fedora Extras 5.
 
 * Wed Sep 23 2005 Christoph Wickert  - 0.8-2



From fedora-extras-commits at redhat.com  Wed Feb 15 01:09:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Feb 2006 20:09:49 -0500
Subject: rpms/perl-GD/devel perl-GD.spec,1.11,1.12
Message-ID: <200602150110.k1F1AL0U005348@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	perl-GD.spec 
Log Message:
Missing BR: fontconfig-devel.


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-GD.spec	13 Feb 2006 19:21:33 -0000	1.11
+++ perl-GD.spec	15 Feb 2006 01:09:48 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-GD
 Version:        2.30
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -12,7 +12,8 @@
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  gd-devel >= 2.0.28
 BuildRequires:  %{_bindir}/gdlib-config
-BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel, libX11-devel, libXpm-devel
+BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel
+BuildRequires:  fontconfig-devel, libX11-devel, libXpm-devel
 Requires:       gd >= 2.0.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -64,6 +65,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Jose Pedro Oliveira  - 2.30-3
+- Missing BR: fontconfig-devel.
+
 * Mon Feb 13 2006 Jose Pedro Oliveira  - 2.30-2
 - Modular X (libX11-devel, libXpm-devel).
 



From fedora-extras-commits at redhat.com  Wed Feb 15 01:14:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Feb 2006 20:14:11 -0500
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.10,1.11
Message-ID: <200602150114.k1F1Eh8B005431@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5414

Modified Files:
	syslog-ng.spec 
Log Message:
Rebuild.


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- syslog-ng.spec	19 Dec 2005 18:30:33 -0000	1.10
+++ syslog-ng.spec	15 Feb 2006 01:14:10 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:             syslog-ng
 Version:          1.6.9
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Jose Pedro Oliveira  - 1.6.9-3
+- Rebuild.
+
 * Mon Dec 19 2005 Jose Pedro Oliveira  - 1.6.9-2
 - Provides syslog instead of sysklogd (#172885).
 



From fedora-extras-commits at redhat.com  Wed Feb 15 01:20:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Feb 2006 20:20:42 -0500
Subject: rpms/srecord/devel srecord.spec,1.2,1.3
Message-ID: <200602150121.k1F1LENv005558@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	srecord.spec 
Log Message:
Rebuild.


Index: srecord.spec
===================================================================
RCS file: /cvs/extras/rpms/srecord/devel/srecord.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- srecord.spec	23 Sep 2005 12:25:47 -0000	1.2
+++ srecord.spec	15 Feb 2006 01:20:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           srecord
 Version:        1.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate EPROM load files
 
 Group:          Development/Tools
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Jose Pedro Oliveira  - 1.23-2
+- Rebuild.
+
 * Fri Sep 23 2005 Jose Pedro Oliveira  - 1.23-1
 - Update to 1.23.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 01:24:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 14 Feb 2006 20:24:27 -0500
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.4,1.5
Message-ID: <200602150124.k1F1OxLh005659@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5635

Modified Files:
	gnome-applet-timer.spec 
Log Message:
Rebuild for Fedora Extras 5


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-applet-timer.spec	15 Dec 2005 15:23:35 -0000	1.4
+++ gnome-applet-timer.spec	15 Feb 2006 01:24:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -89,10 +89,13 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
-* Wed Dec 15 2005 Christoph Wickert  - 1.2-2
+* Wed Feb 15 2006 Christoph Wickert  - 1.2-3
+- Rebuild for Fedora Extras 5.
+
+* Thu Dec 15 2005 Christoph Wickert  - 1.2-2
 - Bump release due to tag collision in Core 4.
 
-* Wed Dec 15 2005 Christoph Wickert  - 1.2-1
+* Thu Dec 15 2005 Christoph Wickert  - 1.2-1
 - Update to 1.2.
 - Remove all specfile hacks, problems are fixed upstream.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 01:48:13 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Tue, 14 Feb 2006 20:48:13 -0500
Subject: rpms/perl-XML-LibXSLT/devel perl-XML-LibXSLT.spec,1.4,1.5
Message-ID: <200602150148.k1F1mjmE005848@cvs-int.fedora.redhat.com>

Author: shishz

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

Modified Files:
	perl-XML-LibXSLT.spec 
Log Message:
* Tue Feb 14 2006 Zing  - 1.58-2
- rebuild for FE5



Index: perl-XML-LibXSLT.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/perl-XML-LibXSLT.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-XML-LibXSLT.spec	17 Aug 2005 17:52:06 -0000	1.4
+++ perl-XML-LibXSLT.spec	15 Feb 2006 01:48:13 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		perl-XML-LibXSLT
 Version:	1.58
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	Perl module for interfacing to GNOME's libxslt
 
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Feb 14 2006 Zing  - 1.58-2
+- rebuild for FE5
+
 * Wed Aug 17 2005 Zing  - 1.58-1
 - new upstream
 - use dist macro



From fedora-extras-commits at redhat.com  Wed Feb 15 01:48:41 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Feb 2006 20:48:41 -0500
Subject: rpms/kphone/devel kphone.spec,1.23,1.24
Message-ID: <200602150149.k1F1nEJg005887@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	kphone.spec 
Log Message:
disable srtp  was testing locally.  we dont have the deps



Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kphone.spec	14 Feb 2006 12:42:29 -0000	1.23
+++ kphone.spec	15 Feb 2006 01:48:41 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -35,7 +35,7 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure  --enable-srtp
+%configure  
 make %{?_smp_mflags}
 
 %install
@@ -65,6 +65,9 @@
 
 %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



From fedora-extras-commits at redhat.com  Wed Feb 15 02:13:48 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 14 Feb 2006 21:13:48 -0500
Subject: rpms/gqview/devel gqview.spec,1.7,1.8
Message-ID: <200602150214.k1F2ELhO007856@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	gqview.spec 
Log Message:
* Wed Feb 15 2006 Michael Schwendt  - 2.0.1-3
- rebuilt for FC5



Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gqview.spec	16 Aug 2005 23:28:35 -0000	1.7
+++ gqview.spec	15 Feb 2006 02:13:40 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:	Image browser and viewer
 Name:		gqview
 Version:	2.0.1
-Release:	2
+Release:	3
 License:	GPL
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Michael Schwendt  - 2.0.1-3
+- rebuilt for FC5
+
 * Wed Aug 17 2005 Michael Schwendt  - 2.0.1-2
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Feb 15 02:16:00 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 14 Feb 2006 21:16:00 -0500
Subject: rpms/sylpheed/devel sylpheed.spec,1.26,1.27
Message-ID: <200602150216.k1F2GWPN007953@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	sylpheed.spec 
Log Message:
* Wed Feb 15 2006 Michael Schwendt  - 2.0.4-2
- rebuilt for FC5



Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sylpheed.spec	11 Nov 2005 11:03:35 -0000	1.26
+++ sylpheed.spec	15 Feb 2006 02:16:00 -0000	1.27
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
@@ -81,6 +81,9 @@
 %{_mandir}/man1
 
 %changelog
+* Wed Feb 15 2006 Michael Schwendt  - 2.0.4-2
+- rebuilt for FC5
+
 * Thu Nov 10 2005 Michael Schwendt  - 2.0.4-1
 - Update to 2.0.4 (security).
 



From fedora-extras-commits at redhat.com  Wed Feb 15 02:19:31 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Tue, 14 Feb 2006 21:19:31 -0500
Subject: rpms/snownews/devel snownews.spec,1.7,1.8
Message-ID: <200602150220.k1F2K480008047@cvs-int.fedora.redhat.com>

Author: shishz

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

Modified Files:
	snownews.spec 
Log Message:
* Tue Feb 14 2006 Zing  - 1.5.7-4
- rebuild for FE5



Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- snownews.spec	30 Aug 2005 19:45:58 -0000	1.7
+++ snownews.spec	15 Feb 2006 02:19:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		snownews
 Version: 	1.5.7
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPL
@@ -55,6 +55,9 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Feb 14 2006 Zing  - 1.5.7-4
+- rebuild for FE5
+
 * Mon Aug 29 2005 Zing  - 1.5.7-3
 - cleanups related to runtime charset detection
 -   get rid of configure --charset=UTF-8 hardcoding



From fedora-extras-commits at redhat.com  Wed Feb 15 02:24:28 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 14 Feb 2006 21:24:28 -0500
Subject: rpms/wesnoth/devel wesnoth.spec,1.25,1.26
Message-ID: <200602150225.k1F2P1ns008246@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	wesnoth.spec 
Log Message:
* Wed Feb 15 2006 Michael Schwendt  - 1.0.2-2
- rebuilt for FC5



Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wesnoth.spec	21 Dec 2005 19:34:55 -0000	1.25
+++ wesnoth.spec	15 Feb 2006 02:24:28 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           wesnoth
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -158,6 +158,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Feb 15 2006 Michael Schwendt  - 1.0.2-2
+- rebuilt for FC5
+
 * Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
 - update to 1.0.2
 



From fedora-extras-commits at redhat.com  Wed Feb 15 02:27:16 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 14 Feb 2006 21:27:16 -0500
Subject: rpms/gai-temp/devel gai-temp.spec,1.7,1.8
Message-ID: <200602150227.k1F2RmiI008319@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gai-temp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8298

Modified Files:
	gai-temp.spec 
Log Message:
* Wed Feb 15 2006 Michael Schwendt  - 0.1.1-4
- rebuilt for FC5



Index: gai-temp.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-temp/devel/gai-temp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gai-temp.spec	16 Aug 2005 23:33:05 -0000	1.7
+++ gai-temp.spec	15 Feb 2006 02:27:16 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:	GAI based applet that displays HDD and CPU temperature
 Name:		gai-temp
 Version:	0.1.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source0:	http://leidola.newcon.de/daten/gai-temp/%{name}-%{version}.tar.gz
 URL:		http://leidola.newcon.de/projekte/gai-temp/gai-temp-en.html
 License:	GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Michael Schwendt  - 0.1.1-4
+- rebuilt for FC5
+
 * Wed Aug 17 2005 Michael Schwendt  - 0.1.1-3
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Feb 15 02:45:19 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 21:45:19 -0500
Subject: rpms/MochiKit - New directory
Message-ID: <200602150245.k1F2jLBd008439@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Wed Feb 15 02:45:25 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 21:45:25 -0500
Subject: rpms/MochiKit/devel - New directory
Message-ID: <200602150245.k1F2jRGt008454@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Wed Feb 15 02:46:44 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 21:46:44 -0500
Subject: rpms/MochiKit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602150246.k1F2kkEZ008488@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 15 02:46:59 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 21:46:59 -0500
Subject: rpms/MochiKit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602150247.k1F2l1Cj008508@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


--- NEW 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 Feb 15 02:51:28 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 21:51:28 -0500
Subject: rpms/MochiKit import.log,1.1,1.2
Message-ID: <200602150252.k1F2q170008584@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/MochiKit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Feb 2006 02:46:44 -0000	1.1
+++ import.log	15 Feb 2006 02:51:28 -0000	1.2
@@ -0,0 +1 @@
+MochiKit-1_2-1:HEAD:MochiKit-1.2-1.src.rpm:1139971850



From fedora-extras-commits at redhat.com  Wed Feb 15 02:51:34 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 14 Feb 2006 21:51:34 -0500
Subject: rpms/MochiKit/devel MochiKit.conf, NONE, 1.1 MochiKit.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602150252.k1F2q6vu008588@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


--- NEW FILE MochiKit.conf ---
Alias /MochiKit /usr/share/MochiKit


--- NEW FILE MochiKit.spec ---
Name:           MochiKit
Version:        1.2
Release:        1%{?dist}
Summary:        A lightweight JavaScript library

Group:          Applications/Internet
License:        MIT/Academic
URL:            http://www.mochikit.com/
Source0:        http://www.mochikit.com/dist/%{name}-%{version}.zip
Source1:        %{name}.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

#BuildRequires:  
Requires:       httpd

%description
MochiKit is a highly-documented and well-tested suite of JavaScript libraries
that will help you get stuff done, fast.

%prep
%setup -q
find \( -name \*.js -o -name \*.css \) -exec sed -i 's/\r//g' {} \;

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 0644 lib/MochiKit/* $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes doc examples LICENSE.txt
%{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf

%changelog
* Sun Feb 12 2006 Ignacio Vazquez-Abrams  1.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/MochiKit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Feb 2006 02:46:58 -0000	1.1
+++ .cvsignore	15 Feb 2006 02:51:34 -0000	1.2
@@ -0,0 +1 @@
+MochiKit-1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/MochiKit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Feb 2006 02:46:58 -0000	1.1
+++ sources	15 Feb 2006 02:51:34 -0000	1.2
@@ -0,0 +1 @@
+1a22e956ea2cabe04bad99878986b952  MochiKit-1.2.zip



From fedora-extras-commits at redhat.com  Wed Feb 15 03:46:58 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue, 14 Feb 2006 22:46:58 -0500
Subject: rpms/meanwhile/devel meanwhile.spec,1.7,1.8
Message-ID: <200602150347.k1F3lU7n010611@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	meanwhile.spec 
Log Message:
bump for rebuild


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/meanwhile.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- meanwhile.spec	3 Jan 2006 18:12:43 -0000	1.7
+++ meanwhile.spec	15 Feb 2006 03:46:58 -0000	1.8
@@ -7,7 +7,7 @@
 License:	LGPL
 Group:		Applications/Internet
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,6 +77,9 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Tue Feb 14 2006 - jwboyer at jdub.homelinux.org 1.0.2-2
+- Bump for FE5 rebuild
+
 * Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.0.2-1
 - Update to latest release
 - Fixes crash when merging buddy list with server



From fedora-extras-commits at redhat.com  Wed Feb 15 03:48:53 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue, 14 Feb 2006 22:48:53 -0500
Subject: rpms/python-clientform/devel python-clientform.spec,1.1,1.2
Message-ID: <200602150349.k1F3nQMF010696@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	python-clientform.spec 
Log Message:
Bump for rebuild


Index: python-clientform.spec
===================================================================
RCS file: /cvs/extras/rpms/python-clientform/devel/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	15 Feb 2006 03:48:53 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-clientform
 Version:        0.1.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python module for client-side HTML forms
 
 Group:          Development/Languages
@@ -45,6 +45,9 @@
 %ghost %{python_sitelib}/ClientForm.pyo
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Wed Feb 15 06:31:18 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 01:31:18 -0500
Subject: rpms/numlockx/devel numlockx.spec,1.6,1.7
Message-ID: <200602150631.k1F6VpZR016569@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

Modified Files:
	numlockx.spec 
Log Message:
* Wed Feb 15 2006 John Mahowald  1.0-8
- Rebuild for Fedora Extras 5



Index: numlockx.spec
===================================================================
RCS file: /cvs/extras/rpms/numlockx/devel/numlockx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numlockx.spec	30 Nov 2005 06:39:47 -0000	1.6
+++ numlockx.spec	15 Feb 2006 06:31:18 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           numlockx
 Version:        1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NumLockX turns on NumLock after starting X
 
 Group:          Applications/System
@@ -41,6 +41,9 @@
 %doc AUTHORS README LICENSE
 
 %changelog
+* Wed Feb 15 2006 John Mahowald  1.0-8
+- Rebuild for Fedora Extras 5
+
 * Tue Nov 29 2005 John Mahowald  1.0-7
 - More Buildreqires fixes to satisfy configure
 



From fedora-extras-commits at redhat.com  Wed Feb 15 06:41:56 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 01:41:56 -0500
Subject: rpms/numlockx/devel numlockx.spec,1.7,1.8
Message-ID: <200602150642.k1F6gTQH016680@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

Modified Files:
	numlockx.spec 
Log Message:
* Wed Feb 15 2006 John Mahowald  1.0-8
- Rebuild for Fedora Extras 5



Index: numlockx.spec
===================================================================
RCS file: /cvs/extras/rpms/numlockx/devel/numlockx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- numlockx.spec	15 Feb 2006 06:31:18 -0000	1.7
+++ numlockx.spec	15 Feb 2006 06:41:56 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           numlockx
 Version:        1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        NumLockX turns on NumLock after starting X
 
 Group:          Applications/System
@@ -41,7 +41,7 @@
 %doc AUTHORS README LICENSE
 
 %changelog
-* Wed Feb 15 2006 John Mahowald  1.0-8
+* Wed Feb 15 2006 John Mahowald  1.0-9
 - Rebuild for Fedora Extras 5
 
 * Tue Nov 29 2005 John Mahowald  1.0-7



From fedora-extras-commits at redhat.com  Wed Feb 15 06:54:00 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 01:54:00 -0500
Subject: rpms/pyxdg/devel pyxdg.spec,1.2,1.3
Message-ID: <200602150654.k1F6sXXH016778@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

Modified Files:
	pyxdg.spec 
Log Message:
* Wed Feb 15 2006 John Mahowald  - 0.15.2
- Rebuild for Fedora Extras 5



Index: pyxdg.spec
===================================================================
RCS file: /cvs/extras/rpms/pyxdg/devel/pyxdg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyxdg.spec	14 Oct 2005 20:29:41 -0000	1.2
+++ pyxdg.spec	15 Feb 2006 06:54:00 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:    	pyxdg
 Version: 	0.15
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	PyXDG is a python library to access freedesktop.org standards
 
 
@@ -38,6 +38,9 @@
 %{python_sitelib}/xdg
 
 %changelog
+* Wed Feb 15 2006 John Mahowald  - 0.15.2
+- Rebuild for Fedora Extras 5
+
 * Fri Oct 14 2005 John Mahowald  - 0.15-1
 - Rebuilt for 0.15
 



From fedora-extras-commits at redhat.com  Wed Feb 15 07:05:43 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 02:05:43 -0500
Subject: rpms/alacarte - New directory
Message-ID: <200602150705.k1F75jkm018718@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

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




From fedora-extras-commits at redhat.com  Wed Feb 15 07:05:50 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 02:05:50 -0500
Subject: rpms/alacarte/devel - New directory
Message-ID: <200602150705.k1F75qUR018733@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

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




From fedora-extras-commits at redhat.com  Wed Feb 15 07:06:17 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 02:06:17 -0500
Subject: rpms/alacarte Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200602150706.k1F76JQq018773@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Feb 15 07:06:24 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 02:06:24 -0500
Subject: rpms/alacarte/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200602150706.k1F76QwL018793@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

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


--- NEW 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 Feb 15 07:06:49 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 02:06:49 -0500
Subject: rpms/alacarte import.log,1.1,1.2
Message-ID: <200602150707.k1F77MLC018861@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alacarte/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Feb 2006 07:06:17 -0000	1.1
+++ import.log	15 Feb 2006 07:06:49 -0000	1.2
@@ -0,0 +1 @@
+alacarte-0_8-4:HEAD:alacarte-0.8-4.src.rpm:1139987065



From fedora-extras-commits at redhat.com  Wed Feb 15 07:06:57 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 02:06:57 -0500
Subject: rpms/alacarte/devel alacarte.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200602150707.k1F77jFN018865@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

Modified Files:
	.cvsignore sources 
Added Files:
	alacarte.spec 
Log Message:
auto-import alacarte-0.8-4 on branch devel from alacarte-0.8-4.src.rpm


--- NEW FILE alacarte.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:           alacarte
Version:        0.8
Release:        4%{?dist}
Summary:        Simple menu editor for GNOME

Group:          Applications/System
License:        GPL
URL:            http://www.realistanew.com/projects/alacarte/
Source0:        http://dev.realistanew.com/alacarte/releases/%{version}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires: 	desktop-file-utils 
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires: 	pyxdg >= 0.14
Requires: 	pygtk2, gnome-python2-gconf 
Obsoletes:      smeg
Provides:       smeg %{version}-%{release}
%description
Alacarte is a menu editor for GNOME that lets you get things done,
simply and quickly. 

Just click and type to edit, add, and delete any menu entry.

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

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root=$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/alacarte.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README AUTHORS COPYING
%{python_sitelib}/Alacarte
%{_bindir}/*
%{_datadir}/applications/*


%changelog
* Wed Feb 15 2006 John Mahowald  - 0.8-4
- Rebuild for Fedora Extras 5

* Fri Feb 3 2006  John Mahowald  - 0.8-3
- Fix stray reference to smeg
- Use python sitearch macro from template

* Sat Oct 29 2005  John Mahowald  - 0.8-2
- Rebuild

* Thu Oct 27 2005  John Mahowald  - 0.8-1
- rename to alacarte
- Update to 0.8

* Thu Oct 20 2005  John Mahowald  - 0.7.5-4
- remove requires gnome-menus

* Tue Aug 30 2005 John Mahowald  - 0.7.5-3
- Move to /usr/share

* Tue Jun 28 2005 Sindre Pedersen Bjordal  - 0.7.5-2
- Desktop-file-utils for kde desktop entry as well as default one.

* Wed Jun 08 2005 Sindre Pedersen Bjordal  - 0.7.5-1
- Rebuilt for 0.7.5

* Sun Jun 06 2005 Sindre Pedersen Bjordal  - 0.7.4-1
- Rebuilt for 0.7.4

* Wed Jun 01 2005 Sindre Pedersen Bjordal  - 0.7.1-1
- Rebuilt for 0.7.1
- Smeg now use the stock gnome menu icon, removed pixmaps from %files

* Wed Jun 01 2005 Sindre Pedersen Bjordal  - 0.7-2
- Added missing dependency gnome-python2-gconf

* Tue May 31 2005 Sindre Pedersen Bjordal  - 0.7-1
- Rebuilt for 0.7

* Mon May 30 2005 Sindre Pedersen Bjordal  - 0.6.2-2
- Added desktop-file-utils to Buildrequires
- Addded desktop-file-utils %post and %postun

* Sat May 29 2005 Sindre Pedersen Bjordal  - 0.6.2-1
- Rebuilt for 0.6.2

* Mon May 23 2005 Sindre Pedersen Bjordal  - 0.5-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Feb 2006 07:06:24 -0000	1.1
+++ .cvsignore	15 Feb 2006 07:06:57 -0000	1.2
@@ -0,0 +1 @@
+alacarte-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Feb 2006 07:06:24 -0000	1.1
+++ sources	15 Feb 2006 07:06:57 -0000	1.2
@@ -0,0 +1 @@
+849fc35c84c81736974217bb810390b1  alacarte-0.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb 15 07:09:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 15 Feb 2006 02:09:30 -0500
Subject: rpms/rbldnsd/devel rbldnsd.spec,1.1,1.2
Message-ID: <200602150710.k1F7A24m018965@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	rbldnsd.spec 
Log Message:
license text not included in upstream tarball, so don't include it



Index: rbldnsd.spec
===================================================================
RCS file: /cvs/extras/rpms/rbldnsd/devel/rbldnsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rbldnsd.spec	29 Jun 2005 06:14:33 -0000	1.1
+++ rbldnsd.spec	15 Feb 2006 07:09:30 -0000	1.2
@@ -1,13 +1,12 @@
 Summary:	Small, fast daemon to serve DNSBLs
 Name:		rbldnsd
 Version:	0.995
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.corpit.ru/mjt/rbldnsd.html
 Source0:	http://www.corpit.ru/mjt/rbldnsd/rbldnsd_%{version}.tar.gz
 Source1:	rbldnsd.init
-Source2:	http://www.fsf.org/licensing/licenses/gpl.txt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre):    %{_sbindir}/useradd
@@ -24,7 +23,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%{__cp} %{SOURCE2} .
 %{__sed} -i -e 's@/var/lib/rbldns\([/ ]\)@%{_localstatedir}/lib/rbldnsd\1 at g' \
 	    -e 's@\(-r/[a-z/]*\) -b@\1 -q -b at g' debian/rbldnsd.default
 
@@ -62,7 +60,7 @@
 
 %files
 %defattr (-,root,root,0755)
-%doc README.user NEWS TODO debian/changelog CHANGES-0.81 gpl.txt
+%doc README.user NEWS TODO debian/changelog CHANGES-0.81
 %{_sbindir}/rbldnsd
 %{_mandir}/man8/rbldnsd.8*
 %dir %{_localstatedir}/lib/rbldnsd
@@ -70,6 +68,9 @@
 %{_initrddir}/rbldnsd
 
 %changelog
+* Wed Feb 15 2006 Paul Howarth  0.995-5
+- license text not included in upstream tarball, so don't include it
+
 * Tue Jun 28 2005 Paul Howarth  0.995-4
 - include gpl.txt as %%doc
 



From fedora-extras-commits at redhat.com  Wed Feb 15 07:09:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Feb 2006 02:09:32 -0500
Subject: rpms/pcsc-perl/devel pcsc-perl.spec,1.6,1.7
Message-ID: <200602150710.k1F7A4IP018966@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	pcsc-perl.spec 
Log Message:
* Wed Feb 15 2006 Ville Skytt??  - 1.3.1-8
- Rebuild, cosmetics.



Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pcsc-perl.spec	22 May 2005 22:30:31 -0000	1.6
+++ pcsc-perl.spec	15 Feb 2006 07:09:32 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           pcsc-perl
 Version:        1.3.1
-Release: 7
+Release:        8%{?dist}
 Summary:        Perl interface to the PC/SC smart card library
 
 Group:          Development/Libraries
@@ -11,7 +11,8 @@
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-perl/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl >= 1:5.6.1, pcsc-lite-devel = %{pcscver}
+BuildRequires:  perl
+BuildRequires:  pcsc-lite-devel = %{pcscver}
 Requires:       pcsc-lite-libs = %{pcscver}
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Provides:       perl-pcsc = %{version}-%{release}
@@ -27,9 +28,9 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor INC= \
-  DEFINE=-Wall
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \
+  DEFINE=-Wall INC=
+make %{?_smp_mflags}
 
 
 %install
@@ -41,8 +42,8 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
-# skipping tests
+%check
+# tests need configured readers etc
 
 
 %clean
@@ -51,13 +52,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changelog LICENCE README examples
-%{perl_vendorarch}/auto/Chipcard
-%{perl_vendorarch}/Chipcard
-%{_mandir}/man3/*.3*
+%doc Changelog LICENCE README examples/
+%{perl_vendorarch}/auto/Chipcard/
+%{perl_vendorarch}/Chipcard/
+%{_mandir}/man3/Chipcard::PCSC*.3*
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skytt??  - 1.3.1-8
+- Rebuild, cosmetics.
+
 * Sun May 22 2005 Jeremy Katz  - 1.3.1-7
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Wed Feb 15 07:13:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 15 Feb 2006 02:13:22 -0500
Subject: rpms/hmmer/devel hmmer.spec,1.3,1.4
Message-ID: <200602150713.k1F7DsP1019129@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	hmmer.spec 
Log Message:
rebuild for FE 5


Index: hmmer.spec
===================================================================
RCS file: /cvs/extras/rpms/hmmer/devel/hmmer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hmmer.spec	23 Dec 2005 17:22:59 -0000	1.3
+++ hmmer.spec	15 Feb 2006 07:13:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hmmer
 Version:        2.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Profile HMM software for protein sequence analysis
 
 Group:          Applications/Engineering
@@ -9,9 +9,6 @@
 Source0:        ftp://ftp.genetics.wustl.edu/pub/eddy/hmmer/%{version}/hmmer-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  
-#Requires:       
-
 %description
 Profile hidden Markov models (profile HMMs) can be used to do sensitive
 database searching using statistical descriptions of a sequence family's
@@ -51,6 +48,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Christian Iseli  2.3.2-5
+ - Minor spec cleanup.  Rebuild for FE 5.
+
 * Fri Dec 23 2005 Christian Iseli  2.3.2-4
  - Rebuild with gcc-4.1.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 07:16:42 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 15 Feb 2006 02:16:42 -0500
Subject: rpms/nfswatch/devel nfswatch.spec,1.6,1.7
Message-ID: <200602150717.k1F7HGQn019269@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	nfswatch.spec 
Log Message:
rebuild for FE 5


Index: nfswatch.spec
===================================================================
RCS file: /cvs/extras/rpms/nfswatch/devel/nfswatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nfswatch.spec	23 Dec 2005 17:26:01 -0000	1.6
+++ nfswatch.spec	15 Feb 2006 07:16:42 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: An NFS traffic monitoring tool
 Name: nfswatch
 Version: 4.99.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: BSD
 URL: http://nfswatch.sourceforge.net
@@ -47,6 +47,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 23 2005 Christian Iseli  4.99.5-3
+ - rebuild for FE 5
+
 * Fri Dec 23 2005 Christian Iseli  4.99.5-2
  - rebuild with gcc-4.1
 



From fedora-extras-commits at redhat.com  Wed Feb 15 07:16:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Feb 2006 02:16:54 -0500
Subject: rpms/ccid/devel ccid.spec,1.4,1.5
Message-ID: <200602150717.k1F7HQWE019314@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	ccid.spec 
Log Message:
* Wed Feb 15 2006 Ville Skytt??  - 0.4.1-7
- Rebuild.



Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/devel/ccid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ccid.spec	13 Nov 2005 11:35:09 -0000	1.4
+++ ccid.spec	15 Feb 2006 07:16:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ccid
 Version:        0.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
@@ -58,10 +58,14 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README GemPCTwin.reader.conf
-%{_libdir}/pcsc/drivers/*
+%{_libdir}/pcsc/drivers/ifd-ccid.bundle/
+%{_libdir}/pcsc/drivers/serial/
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skytt??  - 0.4.1-7
+- Rebuild.
+
 * Thu Nov  3 2005 Ville Skytt??  - 0.4.1-6
 - Clean up build dependencies.
 - Convert docs to UTF-8.



From fedora-extras-commits at redhat.com  Wed Feb 15 07:18:04 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 02:18:04 -0500
Subject: rpms/alacarte/devel alacarte.spec,1.1,1.2
Message-ID: <200602150718.k1F7Ia2g019398@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

Modified Files:
	alacarte.spec 
Log Message:

* Wed Feb 15 2006 John Mahowald  - 0.8-5
- Rebuild for Fedora Extras 5




Index: alacarte.spec
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alacarte.spec	15 Feb 2006 07:06:57 -0000	1.1
+++ alacarte.spec	15 Feb 2006 07:18:03 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           alacarte
 Version:        0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -57,7 +57,7 @@
 
 
 %changelog
-* Wed Feb 15 2006 John Mahowald  - 0.8-4
+* Wed Feb 15 2006 John Mahowald  - 0.8-5
 - Rebuild for Fedora Extras 5
 
 * Fri Feb 3 2006  John Mahowald  - 0.8-3



From fedora-extras-commits at redhat.com  Wed Feb 15 07:19:48 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 15 Feb 2006 02:19:48 -0500
Subject: rpms/SIBsim4/devel SIBsim4.spec,1.1,1.2
Message-ID: <200602150720.k1F7KKTY019478@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	SIBsim4.spec 
Log Message:
rebuild for FE 5


Index: SIBsim4.spec
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/devel/SIBsim4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SIBsim4.spec	18 Jan 2006 10:28:51 -0000	1.1
+++ SIBsim4.spec	15 Feb 2006 07:19:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           SIBsim4
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Align expressed RNA sequences on a DNA template
 Group:          Applications/Engineering
 License:        GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Christian Iseli  0.9-2
+- Rebuild for FE 5.
+
 * Wed Jan 18 2006 Christian Iseli  0.9-1
 - Add LIBS=-lm.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 07:20:32 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 15 Feb 2006 02:20:32 -0500
Subject: rpms/spamass-milter/devel spamass-milter.spec,1.5,1.6
Message-ID: <200602150721.k1F7L4Dl019541@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/spamass-milter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19487

Modified Files:
	spamass-milter.spec 
Log Message:
Don't use macros in command paths, hardcode them instead



Index: spamass-milter.spec
===================================================================
RCS file: /cvs/extras/rpms/spamass-milter/devel/spamass-milter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spamass-milter.spec	1 Aug 2005 11:14:25 -0000	1.5
+++ spamass-milter.spec	15 Feb 2006 07:20:32 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:        Sendmail milter for spamassassin
 Name:           spamass-milter
 Version:        0.3.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://savannah.nongnu.org/projects/spamass-milt/
@@ -13,7 +13,7 @@
 BuildRequires:  spamassassin, sendmail-devel
 Requires:       spamassassin, sendmail
 
-Requires(pre):  %{_sbindir}/useradd
+Requires(pre):  /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 %{__cp} %{SOURCE1} .
-%{__sed} -i -e 's at local:/var/run/sendmail/spamass.sock at unix:/var/run/spamass-milter/spamass-milter.sock@' README
+%{__sed} -i -e 's at local:/var/run/sendmail/spamass.sock at unix:%{_localstatedir}/run/spamass-milter/spamass-milter.sock@' README
 
 %{__cat} <spamass-milter.sysconfig
 ### Override for your different local config
@@ -133,7 +133,7 @@
 EOF
 
 %build
-export SENDMAIL=%{_sbindir}/sendmail
+export SENDMAIL=/usr/sbin/sendmail
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -147,7 +147,7 @@
 %{__install}    -m0755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper
 
 %pre
-%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/run/spamass-milter \
+/usr/sbin/useradd -r -s /sbin/nologin -d %{_localstatedir}/run/spamass-milter \
 	-c "SpamAssassin Milter" sa-milt &>/dev/null || :
 
 %post
@@ -176,6 +176,9 @@
 %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter
 
 %changelog
+* Wed Feb 16 2006 Paul Howarth  - 0.3.0-9
+- Don't use macros in command paths, hardcode them instead
+
 * Mon Aug  1 2005 Paul Howarth  - 0.3.0-8
 - Run the milter in a wrapper script that restarts it if it scrashes
 



From fedora-extras-commits at redhat.com  Wed Feb 15 07:21:19 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 15 Feb 2006 02:21:19 -0500
Subject: rpms/nfswatch/devel nfswatch.spec,1.7,1.8
Message-ID: <200602150721.k1F7LpV8019564@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	nfswatch.spec 
Log Message:
Doh...


Index: nfswatch.spec
===================================================================
RCS file: /cvs/extras/rpms/nfswatch/devel/nfswatch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nfswatch.spec	15 Feb 2006 07:16:42 -0000	1.7
+++ nfswatch.spec	15 Feb 2006 07:21:18 -0000	1.8
@@ -47,7 +47,7 @@
 %{_mandir}/man8/*
 
 %changelog
-* Fri Dec 23 2005 Christian Iseli  4.99.5-3
+* Wed Feb 15 2006 Christian Iseli  4.99.5-3
  - rebuild for FE 5
 
 * Fri Dec 23 2005 Christian Iseli  4.99.5-2



From fedora-extras-commits at redhat.com  Wed Feb 15 07:23:51 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 15 Feb 2006 02:23:51 -0500
Subject: rpms/lagan/devel lagan.spec,1.1,1.2
Message-ID: <200602150724.k1F7ONqK019609@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	lagan.spec 
Log Message:
rebuild for FE 5


Index: lagan.spec
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/lagan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lagan.spec	30 Jan 2006 00:16:20 -0000	1.1
+++ lagan.spec	15 Feb 2006 07:23:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lagan
 Version:        1.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Local, global, and multiple alignment of DNA sequences
 
 Group:          Applications/Engineering
@@ -10,8 +10,6 @@
 Patch0:         lagan12-chris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  
-#Requires:       
 
 %description
 LAGAN toolkit is a set of tools for local, global, and multiple alignment of
@@ -76,6 +74,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Christian Iseli  1.21-2
+ - Rebuild for FE 5.
+
 * Mon Jan 30 2006 Christian Iseli  1.21-1
  - Use _libdir instead of _libexecdir and kill all LAGAN_DIR refs.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 07:30:08 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 15 Feb 2006 02:30:08 -0500
Subject: rpms/perl-Class-Loader/devel perl-Class-Loader.spec,1.1,1.2
Message-ID: <200602150730.k1F7UeqF019732@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	perl-Class-Loader.spec 
Log Message:
Rebuild for perl 5.8.8 (FC5)



Index: perl-Class-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Loader/devel/perl-Class-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Loader.spec	1 Feb 2006 08:18:44 -0000	1.1
+++ perl-Class-Loader.spec	15 Feb 2006 07:30:08 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Load modules and create objects on demand
 Name:		perl-Class-Loader
 Version:	2.03
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Class-Loader/
@@ -52,5 +52,8 @@
 %{_mandir}/man3/Class::Loader.3pm*
 
 %changelog
+* Wed Feb 15 2006 Paul Howarth  2.03-2
+- Rebuild for perl 5.8.8 (FC5)
+
 * Mon Dec  5 2005 Paul Howarth  2.03-1
 - Initial build



From fedora-extras-commits at redhat.com  Wed Feb 15 07:31:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Feb 2006 02:31:39 -0500
Subject: rpms/openct/devel openct-0.6.6-rpath64.patch, NONE, 1.1 openct.spec,
	1.7, 1.8
Message-ID: <200602150732.k1F7WBgt019811@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	openct.spec 
Added Files:
	openct-0.6.6-rpath64.patch 
Log Message:
* Wed Feb 15 2006 Ville Skytt??  - 0.6.6-4
- Avoid standard rpaths on lib64 archs.


openct-0.6.6-rpath64.patch:

--- NEW FILE openct-0.6.6-rpath64.patch ---
--- openct-0.6.6/configure~	2005-09-11 13:05:19.000000000 +0300
+++ openct-0.6.6/configure	2006-02-15 09:28:00.000000000 +0200
@@ -9293,7 +9293,7 @@
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
--- openct-0.6.6/acinclude.m4~	2005-09-11 13:04:40.000000000 +0300
+++ openct-0.6.6/acinclude.m4	2006-02-15 09:27:20.000000000 +0200
@@ -2983,7 +2983,7 @@
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openct.spec	28 Nov 2005 19:25:29 -0000	1.7
+++ openct.spec	15 Feb 2006 07:31:39 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           openct
 Version:        0.6.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@
 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
@@ -54,6 +55,8 @@
 
 %prep
 %setup -q
+# patch0: --disable-rpath doesn't appear to do its job
+%patch0 -p1
 sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf
 
 
@@ -149,6 +152,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skytt??  - 0.6.6-4
+- Avoid standard rpaths on lib64 archs.
+
 * Mon Nov 28 2005 Ville Skytt??  - 0.6.6-3
 - Adapt to udev, drop old hotplug support.
 - Init script improvements: incoming events don't start explicitly stopped



From fedora-extras-commits at redhat.com  Wed Feb 15 07:59:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Feb 2006 02:59:11 -0500
Subject: rpms/qascade/devel qascade.spec,1.7,1.8
Message-ID: <200602150759.k1F7xhAk019944@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	qascade.spec 
Log Message:
* Wed Feb 15 2006 Ville Skytt??  - 0.1-5
- Rebuild.



Index: qascade.spec
===================================================================
RCS file: /cvs/extras/rpms/qascade/devel/qascade.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qascade.spec	10 Nov 2005 08:01:02 -0000	1.7
+++ qascade.spec	15 Feb 2006 07:59:10 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           qascade
 Version:        0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Classic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.bitsnpieces.org.uk/qascade/
-Source0:        http://www.bitsnpieces.org.uk/qascade/qascade-0.1.tar.bz2
+Source0:        http://www.bitsnpieces.org.uk/qascade/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Patch0:         %{name}-dblsep.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skytt??  - 0.1-5
+- Rebuild.
+
 * Thu Nov  3 2005 Ville Skytt??  - 0.1-4
 - Clean up build dependencies.
 - Drop workaround for #150528.



From fedora-extras-commits at redhat.com  Wed Feb 15 08:27:47 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 15 Feb 2006 03:27:47 -0500
Subject: rpms/koffice-langpack/devel koffice-langpack.spec,1.3,1.4
Message-ID: <200602150828.k1F8SKb4021893@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice-langpack.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- koffice-langpack.spec	15 Oct 2005 09:54:51 -0000	1.3
+++ koffice-langpack.spec	15 Feb 2006 08:27:47 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           koffice-langpack
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
@@ -488,6 +488,10 @@
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %changelog
+* Wed Feb 15 2006 Andreas Bierfert 
+1.4.2-2
+- Rebuild for Fedora Extras 5
+
 * Sat Oct 15 2005 Andreas Bierfert 
 1.4.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Feb 15 08:30:04 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 15 Feb 2006 03:30:04 -0500
Subject: rpms/libAfterImage/devel libAfterImage.spec,1.4,1.5
Message-ID: <200602150830.k1F8Ua3r021954@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libAfterImage.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: libAfterImage.spec
===================================================================
RCS file: /cvs/extras/rpms/libAfterImage/devel/libAfterImage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libAfterImage.spec	15 Dec 2005 16:14:06 -0000	1.4
+++ libAfterImage.spec	15 Feb 2006 08:30:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libAfterImage
 Version:        1.07
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A generic image manipulation library
 
 Group:          System Environment/Libraries
@@ -92,6 +92,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Feb 15 2006 Andreas Bierfert 
+1.07-7
+- Rebuild for Fedora Extras 5
+
 * Thu Dec 15 2005 Andreas Bierfert 
 1.07-6
 - fix typo



From fedora-extras-commits at redhat.com  Wed Feb 15 08:32:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 15 Feb 2006 03:32:19 -0500
Subject: rpms/libetpan/devel libetpan.spec,1.7,1.8
Message-ID: <200602150832.k1F8WpAk022031@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libetpan.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libetpan.spec	3 Feb 2006 08:52:44 -0000	1.7
+++ libetpan.spec	15 Feb 2006 08:32:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libetpan
 Version:        0.42
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
 Group:          System Environment/Libraries
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Feb 15 2006 Andreas Bierfert 
+0.42-2
+- Rebuild for Fedora Extras 5
+
 * Fri Feb 03 2006 Andreas Bierfert 
 0.42-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Feb 15 08:33:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 15 Feb 2006 03:33:53 -0500
Subject: rpms/centericq/devel centericq.spec,1.21,1.22
Message-ID: <200602150834.k1F8YPHA022099@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	centericq.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- centericq.spec	3 Jan 2006 10:03:25 -0000	1.21
+++ centericq.spec	15 Feb 2006 08:33:53 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -77,6 +77,10 @@
 %exclude %{_includedir}/msn
 
 %changelog
+* Tue Feb 14 2006 Andreas Bierfert 
+4.21.0-5
+- Rebuild for Fedora Extras 5
+
 * Tue Jan 03 2006 Andreas Bierfert 
 4.21.0-4
 - Fix more security related stuff



From fedora-extras-commits at redhat.com  Wed Feb 15 08:38:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 15 Feb 2006 03:38:13 -0500
Subject: rpms/libopensync/devel libopensync.spec,1.5,1.6
Message-ID: <200602150838.k1F8ckH4022174@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync.spec	13 Dec 2005 14:13:57 -0000	1.5
+++ libopensync.spec	15 Feb 2006 08:38:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -102,6 +102,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Feb 15 2006 Andreas Bierfert 
+0.18-6
+- Rebuild for Fedora Extras 5
+
 * Tue Dec 13 2005 Andreas Bierfert 
 0.18-5
 - change handling of ld.so.conf files



From fedora-extras-commits at redhat.com  Wed Feb 15 08:40:37 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 15 Feb 2006 03:40:37 -0500
Subject: rpms/gnuchess/devel gnuchess.spec,1.3,1.4
Message-ID: <200602150841.k1F8fAlJ022204@cvs-int.fedora.redhat.com>

Author: kaboom

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

Modified Files:
	gnuchess.spec 
Log Message:
Bump and rebuild



Index: gnuchess.spec
===================================================================
RCS file: /cvs/extras/rpms/gnuchess/devel/gnuchess.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnuchess.spec	1 Jun 2005 10:32:15 -0000	1.3
+++ gnuchess.spec	15 Feb 2006 08:40:37 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: The GNU chess program
 Name: gnuchess
 Version: 5.07
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: ftp://ftp.gnu.org/pub/gnu/chess/
@@ -13,6 +13,7 @@
 Patch1: gnuchess-5.06-bookpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: chessprogram
+BuildRequires: flex
 
 %description
 The gnuchess package contains the GNU chess program.  By default,
@@ -51,6 +52,9 @@
 %doc doc/* COPYING AUTHORS NEWS TODO 
 
 %changelog
+* Wed Feb 15 2006 Chris Ricker  5.07-9
+- Bump and rebuild
+
 * Wed Jun 01 2005 Chris Ricker  5.07-8%{?dist}
 - Add dist tag
 



From fedora-extras-commits at redhat.com  Wed Feb 15 08:45:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 15 Feb 2006 03:45:13 -0500
Subject: rpms/libpolyxmass/devel libpolyxmass.spec,1.5,1.6
Message-ID: <200602150845.k1F8jj9E022410@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libpolyxmass.spec 
Log Message:
- Rebuild for Fedora Extras 5



Index: libpolyxmass.spec
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/devel/libpolyxmass.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libpolyxmass.spec	25 Jan 2006 15:01:44 -0000	1.5
+++ libpolyxmass.spec	15 Feb 2006 08:45:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libpolyxmass
 Version:        0.9.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Polymer chemistry-related functionalities
 
 Group:          System Environment/Libraries
@@ -78,8 +78,12 @@
 %{_libdir}/pkgconfig/libpolyxmass.pc
 
 %changelog
+* Wed Feb 15 2006 Andreas Bierfert 
+0.9.0-6
+- Rebuild for Fedora Extras 5
+
 * Wed Jan 25 2006 Andreas Bierfert 
-0.9.0-1
+0.9.0-5
 - version upgrade
 
 * Fri Oct 21 2005 Andreas Bierfert 



From fedora-extras-commits at redhat.com  Wed Feb 15 08:46:13 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 15 Feb 2006 03:46:13 -0500
Subject: rpms/perl-Time-modules/devel perl-Time-modules.spec,1.4,1.5
Message-ID: <200602150846.k1F8kjYv022506@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/rpms/perl-Time-modules/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22431

Modified Files:
	perl-Time-modules.spec 
Log Message:
Bump and rebuild



Index: perl-Time-modules.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Time-modules/devel/perl-Time-modules.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Time-modules.spec	1 Jul 2005 16:26:01 -0000	1.4
+++ perl-Time-modules.spec	15 Feb 2006 08:46:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name: perl-Time-modules
 Version: 2003.1126
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Perl modules for parsing dates and times       
 Group: Development/Libraries
 License: Distributable
@@ -43,6 +43,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Feb 15 2006 Chris Ricker  2003.1126-3
+- Bump and rebuild
+
 * Fri Jul 01 2005 Chris Ricker  2003.1126-2
 - Remove overly high perl version BuildRequires (Ralf Corsepius)
 



From fedora-extras-commits at redhat.com  Wed Feb 15 09:25:53 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 15 Feb 2006 04:25:53 -0500
Subject: rpms/galculator/devel galculator.spec,1.8,1.9
Message-ID: <200602150926.k1F9QScY025034@cvs-int.fedora.redhat.com>

Author: tmraz

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

Modified Files:
	galculator.spec 
Log Message:
* Wed Feb 15 2006 Tomas Mraz  - 1.2.5-4
- rebuilt for gcc changes



Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/galculator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- galculator.spec	8 Feb 2006 11:46:16 -0000	1.8
+++ galculator.spec	15 Feb 2006 09:25:52 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           galculator
 Version:        1.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Tomas Mraz  - 1.2.5-4
+- rebuilt for gcc changes
+
 * Wed Feb  8 2006 Tomas Mraz  - 1.2.5-3
 - GladeXML is GObject and cannot be g_free-d (#178227)
 



From fedora-extras-commits at redhat.com  Wed Feb 15 09:30:07 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 15 Feb 2006 04:30:07 -0500
Subject: rpms/galculator/FC-4 galculator-1.2.5-gobject-unref.patch, NONE,
	1.1 galculator.spec, 1.6, 1.7
Message-ID: <200602150930.k1F9UenK025105@cvs-int.fedora.redhat.com>

Author: tmraz

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

Modified Files:
	galculator.spec 
Added Files:
	galculator-1.2.5-gobject-unref.patch 
Log Message:
* Wed Feb 15 2006 Tomas Mraz  - 1.2.5-4
- rebuilt for gcc changes


galculator-1.2.5-gobject-unref.patch:

--- NEW FILE galculator-1.2.5-gobject-unref.patch ---
--- galculator-1.2.5/src/ui.c.unref	2004-10-17 17:23:37.000000000 +0200
+++ galculator-1.2.5/src/ui.c	2006-02-08 12:39:32.000000000 +0100
@@ -313,7 +313,8 @@
 	if (dispctrl_xml) {
 		table_dispctrl = glade_xml_get_widget (dispctrl_xml, "table_dispctrl");
 		if (table_dispctrl) gtk_widget_destroy (table_dispctrl); 
-		g_free (dispctrl_xml);
+		g_object_unref (G_OBJECT (dispctrl_xml));
+		dispctrl_xml = NULL;
 	}	
 	/* now create the new one at location */
 	switch(location) {


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-4/galculator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- galculator.spec	25 Jul 2005 18:54:37 -0000	1.6
+++ galculator.spec	15 Feb 2006 09:30:06 -0000	1.7
@@ -1,12 +1,14 @@
 Name:           galculator
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
 Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
+Patch1:         galculator-1.2.5-gobject-unref.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -22,7 +24,7 @@
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .unref
 
 %build
 %configure
@@ -54,6 +56,15 @@
 
 
 %changelog
+* Wed Feb 15 2006 Tomas Mraz  - 1.2.5-4
+- rebuilt for gcc changes
+
+* Wed Feb  8 2006 Tomas Mraz  - 1.2.5-3
+- GladeXML is GObject and cannot be g_free-d (#178227)
+
+* Thu Aug 18 2005 Michael Schwendt  - 1.2.5-2
+- rebuilt
+
 * Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
 - Update to 1.2.5 (also fixes #162018).
 



From fedora-extras-commits at redhat.com  Wed Feb 15 09:37:20 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 15 Feb 2006 04:37:20 -0500
Subject: rpms/galculator/FC-3 galculator-1.2.5-gobject-unref.patch, NONE,
	1.1 galculator.spec, 1.4, 1.5
Message-ID: <200602150937.k1F9bq3A025233@cvs-int.fedora.redhat.com>

Author: tmraz

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

Modified Files:
	galculator.spec 
Added Files:
	galculator-1.2.5-gobject-unref.patch 
Log Message:
* Wed Feb 15 2006 Tomas Mraz  - 1.2.5-4
- rebuilt for gcc changes


galculator-1.2.5-gobject-unref.patch:

--- NEW FILE galculator-1.2.5-gobject-unref.patch ---
--- galculator-1.2.5/src/ui.c.unref	2004-10-17 17:23:37.000000000 +0200
+++ galculator-1.2.5/src/ui.c	2006-02-08 12:39:32.000000000 +0100
@@ -313,7 +313,8 @@
 	if (dispctrl_xml) {
 		table_dispctrl = glade_xml_get_widget (dispctrl_xml, "table_dispctrl");
 		if (table_dispctrl) gtk_widget_destroy (table_dispctrl); 
-		g_free (dispctrl_xml);
+		g_object_unref (G_OBJECT (dispctrl_xml));
+		dispctrl_xml = NULL;
 	}	
 	/* now create the new one at location */
 	switch(location) {


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-3/galculator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- galculator.spec	25 Jul 2005 18:54:36 -0000	1.4
+++ galculator.spec	15 Feb 2006 09:37:20 -0000	1.5
@@ -1,12 +1,14 @@
 Name:           galculator
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
 Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
+Patch1:         galculator-1.2.5-gobject-unref.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -22,7 +24,7 @@
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .unref
 
 %build
 %configure
@@ -54,6 +56,15 @@
 
 
 %changelog
+* Wed Feb 15 2006 Tomas Mraz  - 1.2.5-4
+- rebuilt for gcc changes
+
+* Wed Feb  8 2006 Tomas Mraz  - 1.2.5-3
+- GladeXML is GObject and cannot be g_free-d (#178227)
+
+* Thu Aug 18 2005 Michael Schwendt  - 1.2.5-2
+- rebuilt
+
 * Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
 - Update to 1.2.5 (also fixes #162018).
 



From fedora-extras-commits at redhat.com  Wed Feb 15 09:41:06 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 15 Feb 2006 04:41:06 -0500
Subject: rpms/link-grammar/devel link-grammar.spec,1.1,1.2
Message-ID: <200602150941.k1F9fdrY025296@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25279

Modified Files:
	link-grammar.spec 
Log Message:
Rebuild for FC5 Extras




Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/link-grammar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- link-grammar.spec	11 Aug 2005 13:45:41 -0000	1.1
+++ link-grammar.spec	15 Feb 2006 09:41:06 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
 Version: 4.1.3
-Release: 3
+Release: 4%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 15 2006 Marc Maurer  4.1.3-4
+- Rebuild for Fedora Extras 5
+- Use %%{?dist} in the release name
+
 * Wed Aug 10 2005 Marc Maurer  - 4.1.3-3
 - Set the buildroot to the standard Fedora buildroot
 - Make the package own the %{_datadir}/link-grammar



From fedora-extras-commits at redhat.com  Wed Feb 15 10:28:36 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 15 Feb 2006 05:28:36 -0500
Subject: rpms/perl-Digest-MD2/devel perl-Digest-MD2.spec,1.1,1.2
Message-ID: <200602151029.k1FAT8ke027329@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27312

Modified Files:
	perl-Digest-MD2.spec 
Log Message:
Rebuild for perl 5.8.8 (FC5)



Index: perl-Digest-MD2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD2/devel/perl-Digest-MD2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Digest-MD2.spec	10 Jan 2006 08:14:34 -0000	1.1
+++ perl-Digest-MD2.spec	15 Feb 2006 10:28:35 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Perl interface to the MD2 Algorithm
 Name:		perl-Digest-MD2
 Version:	2.03
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Digest-MD2/
@@ -47,5 +47,8 @@
 %{_mandir}/man3/Digest::MD2.3pm*
 
 %changelog
+* Wed Feb 15 2006 Paul Howarth  2.03-2
+- Rebuild for perl 5.8.8 (FC5)
+
 * Mon Dec  5 2005 Paul Howarth  2.03-1
 - Initial build



From fedora-extras-commits at redhat.com  Wed Feb 15 10:31:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 15 Feb 2006 05:31:30 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel perl-Digest-BubbleBabble.spec,
	1.2, 1.3
Message-ID: <200602151032.k1FAW2tC027408@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27385

Modified Files:
	perl-Digest-BubbleBabble.spec 
Log Message:
Rebuild for perl 5.8.8 (FC5)



Index: perl-Digest-BubbleBabble.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/devel/perl-Digest-BubbleBabble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Digest-BubbleBabble.spec	3 Jan 2006 10:22:19 -0000	1.2
+++ perl-Digest-BubbleBabble.spec	15 Feb 2006 10:31:30 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	Create bubble-babble fingerprints
 Name:		perl-Digest-BubbleBabble
 Version:	0.01
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Digest-BubbleBabble/
@@ -51,6 +51,9 @@
 %{_mandir}/man3/Digest::BubbleBabble.3pm*
 
 %changelog
+* Wed Feb 15 2006 Paul Howarth  0.01-3
+- Rebuild for perl 5.8.8 (FC5)
+
 * Tue Jan  3 2006 Paul Howarth  0.01-2
 - Don't include README, which contains only install instructions (#175280)
 



From fedora-extras-commits at redhat.com  Wed Feb 15 10:36:03 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 15 Feb 2006 05:36:03 -0500
Subject: rpms/perl-Data-Buffer/devel perl-Data-Buffer.spec,1.1,1.2
Message-ID: <200602151036.k1FAaa3O027488@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Data-Buffer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27471

Modified Files:
	perl-Data-Buffer.spec 
Log Message:
Rebuild for perl 5.8.8 (FC5)



Index: perl-Data-Buffer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Buffer/devel/perl-Data-Buffer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-Buffer.spec	8 Dec 2005 17:12:53 -0000	1.1
+++ perl-Data-Buffer.spec	15 Feb 2006 10:36:03 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Read/write buffer class for perl
 Name:		perl-Data-Buffer
 Version:	0.04
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Data-Buffer/
@@ -43,5 +43,8 @@
 %{_mandir}/man3/Data::Buffer.3pm*
 
 %changelog
+* Wed Feb 15 2006 Paul Howarth  0.04-2
+- Rebuild for perl 5.8.8 (FC5)
+
 * Mon Nov 28 2005 Paul Howarth  0.04-1
 - Initial build



From fedora-extras-commits at redhat.com  Wed Feb 15 10:42:00 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Wed, 15 Feb 2006 05:42:00 -0500
Subject: rpms/gcfilms/devel gcfilms.spec,1.6,1.7
Message-ID: <200602151042.k1FAgWSZ027602@cvs-int.fedora.redhat.com>

Author: tian

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

Modified Files:
	gcfilms.spec 
Log Message:
Preparation for FE5



Index: gcfilms.spec
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/devel/gcfilms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcfilms.spec	19 Nov 2005 17:33:18 -0000	1.6
+++ gcfilms.spec	15 Feb 2006 10:42:00 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gcfilms
 Version:        6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Movies collection management
 
 Group:          Applications/Databases
@@ -97,6 +97,8 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Wed Feb 15 2006 Tian  - 6.0-3
+  - Rebuild for Fedora Extras 5
 * Sun Nov 20 2005 Tian  - 6.0-2
   - Fixed a problem with source
 * Sun Nov 20 2005 Tian  - 6.0-1



From fedora-extras-commits at redhat.com  Wed Feb 15 10:46:05 2006
From: fedora-extras-commits at redhat.com (Christian Jodar (tian))
Date: Wed, 15 Feb 2006 05:46:05 -0500
Subject: rpms/gcfilms/devel gcfilms.spec,1.7,1.8
Message-ID: <200602151046.k1FAkbVx027681@cvs-int.fedora.redhat.com>

Author: tian

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

Modified Files:
	gcfilms.spec 
Log Message:
Update epoch for a cvs problem



Index: gcfilms.spec
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/devel/gcfilms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gcfilms.spec	15 Feb 2006 10:42:00 -0000	1.7
+++ gcfilms.spec	15 Feb 2006 10:46:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gcfilms
 Version:        6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Movies collection management
 
 Group:          Applications/Databases
@@ -97,7 +97,7 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
-* Wed Feb 15 2006 Tian  - 6.0-3
+* Wed Feb 15 2006 Tian  - 6.0-4
   - Rebuild for Fedora Extras 5
 * Sun Nov 20 2005 Tian  - 6.0-2
   - Fixed a problem with source



From fedora-extras-commits at redhat.com  Wed Feb 15 11:52:41 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 15 Feb 2006 06:52:41 -0500
Subject: rpms/workrave/devel workrave.spec,1.4,1.5
Message-ID: <200602151153.k1FBrDq5029859@cvs-int.fedora.redhat.com>

Author: tmraz

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

Modified Files:
	workrave.spec 
Log Message:
* Wed Feb 15 2006 Tomas Mraz  - 1.8.2-2
- Rebuilt with updated gcc



Index: workrave.spec
===================================================================
RCS file: /cvs/extras/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workrave.spec	2 Feb 2006 11:42:35 -0000	1.4
+++ workrave.spec	15 Feb 2006 11:52:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name: workrave
 Version: 1.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers  and Steve Ratcliffe
 License: GPL
@@ -67,6 +67,9 @@
 %{_datadir}/applications/fedora-workrave.desktop
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Wed Feb 15 12:15:48 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 15 Feb 2006 07:15:48 -0500
Subject: rpms/ipxripd/devel ipxripd.spec,1.1,1.2
Message-ID: <200602151216.k1FCGLdY031865@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	ipxripd.spec 
Log Message:



Index: ipxripd.spec
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/devel/ipxripd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipxripd.spec	13 Dec 2005 11:43:45 -0000	1.1
+++ ipxripd.spec	15 Feb 2006 12:15:48 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: IPX RIP/SAP daemon - routing for IPX networks
 Name: ipxripd
 Version: 0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Daemons
 License: GPL
 URL: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Dmitry Butskoy  - 0.8-3
+- rebuild for FC5
+
 * Tue Dec 13 2005 Dmitry Butskoy  - 0.8-2
 - spec file cleanups
 - accepted for Fedora Extra (review by John Mahowald )



From fedora-extras-commits at redhat.com  Wed Feb 15 12:17:23 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 15 Feb 2006 07:17:23 -0500
Subject: rpms/lighttpd/FC-4 favicon.ico, NONE, 1.1 light_button.png, NONE,
	1.1 light_logo.png, NONE, 1.1 .cvsignore, 1.5, 1.6 index.html,
	1.1, 1.2 lighttpd.spec, 1.9, 1.10 sources, 1.5, 1.6 lighttpd.png,
	1.1, NONE
Message-ID: <200602151217.k1FCHx8X031973@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore index.html lighttpd.spec sources 
Added Files:
	favicon.ico light_button.png light_logo.png 
Removed Files:
	lighttpd.png 
Log Message:
Sync FC-4 branch with devel to update from 1.3.x to latest 1.4.10.



--- NEW FILE favicon.ico ---

wOQ<0r
Tc!??;;;;A????????????????H_"?r;???s^
E?????0?U??;;???8?6????s;u?9q????X=?????sNt/,([???;??wPV?n????????	?h;;????B??N????L?E????????????ab???Z??N?s?K???????????????a?????vr??s|??~?????????p????W?t??Kyd?)?}????}R?pU??C&????zE?	?????QR????Z?D?;*E?g????G????g?!j\W?s?????????atx???q?????=n?)?AuU????G=???J ?o'???}???ao?????}???????X???????

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2005 15:05:31 -0000	1.5
+++ .cvsignore	15 Feb 2006 12:17:23 -0000	1.6
@@ -1 +1 @@
-lighttpd-1.3.16.tar.gz
+lighttpd-1.4.10.tar.gz


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-4/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html	23 Feb 2005 00:12:23 -0000	1.1
+++ index.html	15 Feb 2006 12:17:23 -0000	1.2
@@ -1,27 +1,28 @@
-
+
 
 
 
 
 
   Powered by lighttpd
+  
+  
   
 
-
-
-
    lighttpd - Lightning fast, light system requirements
    
+
 
 
    
-Powered by lighttpd
+LIGHTTPD - fly light.
 
    
 
 
    
-Powered by Fedora
+Powered by Fedora
    
+Powered by Lighttpd
 
    
 
 


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-4/lighttpd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lighttpd.spec	1 Aug 2005 15:12:38 -0000	1.9
+++ lighttpd.spec	15 Feb 2006 12:17:23 -0000	1.10
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.3.16
-Release: 2%{?dist}
+Version: 1.4.10
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -11,8 +11,10 @@
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
 Source10: index.html
-Source11: lighttpd.png
+Source11: http://www.lighttpd.net/favicon.ico
 Source12: powered_by_fedora.png
+Source13: http://www.lighttpd.net/light_button.png
+Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
@@ -20,7 +22,10 @@
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++
-%{?_with_ldap:BuildRequires: openldap-devel}
+%{!?_without_ldap:BuildRequires: openldap-devel}
+%{?_with_gamin:BuildRequires: gamin-devel}
+%{!?_without_gdbm:BuildRequires: gdbm-devel}
+%{!?_without_lua:BuildRequires: lua-devel}
 
 %description
 Secure, fast, compliant and very flexible web-server which has been optimized
@@ -31,7 +36,8 @@
 problems.
 
 Available rpmbuild rebuild options :
---with : ldap
+--with : memcache webdavprops gamin
+--without : ldap gdbm lua (cml)
 
 
 %package mod_mysql_vhost
@@ -66,16 +72,20 @@
 %build
 %configure \
     --libdir="%{_libdir}/lighttpd" \
-    --with-openssl \
     --with-mysql \
-    %{?_with_ldap:--with-ldap}
+    %{!?_without_ldap:--with-ldap} \
+    --with-openssl \
+    %{?_with_gamin:--with-fam} \
+    %{!?_without_gdbm:--with-gdbm} \
+    %{?_with_memcache:--with-memcache} \
+    %{?!_without_lua:--with-lua} \
+    %{?_with_webdavprops:--with-webdav-props}
 %{__make}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall \
-    libdir="%{buildroot}%{_libdir}/lighttpd"
+%{__make} install DESTDIR=%{buildroot}
 
 # Install included init script and sysconfig entry
 %{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
@@ -97,7 +107,8 @@
 
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
-%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+    %{SOURCE14} \
     %{buildroot}%{webroot}/
 
 # Install empty log directory to include
@@ -162,6 +173,67 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou  1.4.10-1
+- Update to 1.4.10.
+- Remove now included fix.
+
+* Wed Jan 25 2006 Matthias Saou  1.4.9-2
+- Add mod_fastcgi-fix patch to fix crash on backend overload.
+
+* Mon Jan 16 2006 Matthias Saou  1.4.9-1
+- Update to 1.4.9.
+
+* Wed Nov 23 2005 Matthias Saou  1.4.8-1
+- Update to 1.4.8.
+
+* Fri Nov  4 2005 Matthias Saou  1.4.7-1
+- Update to 1.4.7.
+
+* Wed Oct 12 2005 Matthias Saou  1.4.6-1
+- Update to 1.4.6.
+
+* Mon Oct  3 2005 Matthias Saou  1.4.5-1
+- Update to 1.4.5.
+- Disable gamin/fam support for now, it does not work.
+
+* Tue Sep 27 2005 Matthias Saou  1.4.4-3
+- Update to current SVN to check if it fixes the remaining load problems.
+
+* Wed Sep 21 2005 Matthias Saou  1.4.4-2
+- Patch to SVN 722 revision : Fixes a crash in mod_mysql_vhost and a problem
+  with keepalive and certain browsers.
+
+* Mon Sep 19 2005 Matthias Saou  1.4.4-1
+- Update to 1.4.4 final.
+- Enable ldap auth, gdbm and gamin/fam support by default.
+
+* Thu Sep 15 2005 Matthias Saou  1.4.4-0
+- Update to 1.4.4 pre-release (fixes another fastcgi memleak).
+- Enable lua (cml module) by default.
+- Add --with-webdav-props conditional option.
+
+* Tue Sep 13 2005 Matthias Saou  1.4.3-2
+- Include lighttpd-1.4.3-stat_cache.patch to fix memleak.
+
+* Fri Sep  2 2005 Matthias Saou  1.4.3-1.1
+- Rearrange the included index.html to include the new logo, button and
+  favicon from lighttpd.net.
+
+* Fri Sep  2 2005 Matthias Saou  1.4.3-1
+- Update to 1.4.3.
+- No longer override libdir at make install stage, use DESTDIR instead, as
+  the resulting binary would now have referenced to %%{buildroot} :-(
+
+* Tue Aug 30 2005 Matthias Saou  1.4.2-1
+- Update to 1.4.2.
+
+* Mon Aug 22 2005 Matthias Saou  1.4.1-1
+- Update to 1.4.1.
+
+* Sun Aug 21 2005 Matthias Saou  1.4.0-1
+- Update to 1.4.0.
+- Add conditional of gamin, gdbm, memcache and lua options.
+
 * Mon Aug  1 2005 Matthias Saou  1.3.16-2
 - Update to 1.3.16, rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2005 15:05:32 -0000	1.5
+++ sources	15 Feb 2006 12:17:23 -0000	1.6
@@ -1 +1 @@
-b73f7a7ace4901b6417b0e450aaa5df5  lighttpd-1.3.16.tar.gz
+51e42c2cc98a1f9986b9f232ff5a01f2  lighttpd-1.4.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb 15 12:18:06 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 15 Feb 2006 07:18:06 -0500
Subject: rpms/libtranslate/devel libtranslate.spec,1.2,1.3
Message-ID: <200602151218.k1FCIeOO032015@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	libtranslate.spec 
Log Message:



Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtranslate.spec	14 Sep 2005 11:09:33 -0000	1.2
+++ libtranslate.spec	15 Feb 2006 12:18:06 -0000	1.3
@@ -1,7 +1,7 @@
 Name: libtranslate
 Summary: Natural language translation library
 Version: 0.99
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Libraries
 %define url	http://savannah.nongnu.org/download/libtranslate
@@ -95,6 +95,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Feb 15 2006 Dmitry Butskoy  - 0.99-5
+- rebuild for FC5
+
 * Wed Sep  7 2005 Dmitry Butskoy  - 0.99-4
 - even more cleanups
 - Accepted for Fedora Extra



From fedora-extras-commits at redhat.com  Wed Feb 15 12:19:02 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 15 Feb 2006 07:19:02 -0500
Subject: rpms/gnome-translate/devel gnome-translate.spec,1.5,1.6
Message-ID: <200602151219.k1FCJZvJ032123@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32054

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-translate.spec	2 Feb 2006 12:35:17 -0000	1.5
+++ gnome-translate.spec	15 Feb 2006 12:19:02 -0000	1.6
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -122,6 +122,9 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Wed Feb 15 2006 Dmitry Butskoy  - 0.99-6
+- rebuild for FC5
+
 * Thu Feb  2 2006 Dmitry Butskoy  - 0.99-5
 - add patch for compatibility with eel2 library >= 2.13
 



From fedora-extras-commits at redhat.com  Wed Feb 15 12:19:54 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 15 Feb 2006 07:19:54 -0500
Subject: rpms/makebootfat/devel makebootfat.spec,1.1,1.2
Message-ID: <200602151220.k1FCKQ3P032188@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	makebootfat.spec 
Log Message:



Index: makebootfat.spec
===================================================================
RCS file: /cvs/extras/rpms/makebootfat/devel/makebootfat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- makebootfat.spec	26 Dec 2005 11:55:55 -0000	1.1
+++ makebootfat.spec	15 Feb 2006 12:19:54 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Utility for creation bootable FAT disk
 Name: makebootfat
 Version: 1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: 	Applications/System
 License: GPL
 URL: http://advancemame.sourceforge.net/doc-makebootfat.html
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Dmitry Butskoy  - 1.4-3
+- rebuild for FC5
+
 * Mon Dec 26 2005 Dmitry Butskoy  - 1.4-2
 - place mbrfat.bin and ldlinux.bss under %{_datadir}/%{name}/x86
 



From fedora-extras-commits at redhat.com  Wed Feb 15 12:21:25 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 15 Feb 2006 07:21:25 -0500
Subject: rpms/nail/devel nail.spec,1.8,1.9
Message-ID: <200602151221.k1FCLwIk032253@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	nail.spec 
Log Message:



Index: nail.spec
===================================================================
RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nail.spec	18 Nov 2005 12:47:52 -0000	1.8
+++ nail.spec	15 Feb 2006 12:21:25 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: Enhanced implementation of the mailx command
 Name: nail
 Version: 11.25
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: 	Applications/Internet
 License: BSD
 URL: http://nail.sourceforge.net
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Dmitry Butskoy  - 11.25-6
+- rebuild for FC5
+
 * Wed Nov 16 2005 Dmitry Butskoy  - 11.25-5
 - rebuild.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 12:22:19 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 15 Feb 2006 07:22:19 -0500
Subject: rpms/newscache/devel newscache.spec,1.1,1.2
Message-ID: <200602151222.k1FCMpst032314@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newscache.spec	3 Nov 2005 11:24:48 -0000	1.1
+++ newscache.spec	15 Feb 2006 12:22:18 -0000	1.2
@@ -4,7 +4,7 @@
 Name: 		newscache
 Summary: 	Free cache server for USENET News
 Version: 	1.2
-Release: 	0.2.rc6%{?dist}
+Release: 	0.3.rc6%{?dist}
 Group: 		System Environment/Daemons
 License:	GPL
 URL:		http://www.linuxhacker.at/newscache/
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Dmitry Butskoy  - 1.2-0.3.rc6
+- rebuild for FC5
+
 * Wed Nov  2 2005 Dmitry Butskoy  - 1.2-0.2.rc6
 - spec file cleanups
 - accepted for Fedora Extra



From fedora-extras-commits at redhat.com  Wed Feb 15 12:23:19 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 15 Feb 2006 07:23:19 -0500
Subject: rpms/pam_usb/devel pam_usb.spec,1.2,1.3
Message-ID: <200602151223.k1FCNp8o032379@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	pam_usb.spec 
Log Message:



Index: pam_usb.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_usb/devel/pam_usb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_usb.spec	2 Feb 2006 11:52:52 -0000	1.2
+++ pam_usb.spec	15 Feb 2006 12:23:19 -0000	1.3
@@ -1,7 +1,7 @@
 Name:	pam_usb
 Summary: PAM module for use with DSA key pairs and removable devices
 Version: 0.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Base
 URL:  http://www.pamusb.org
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Dmitry Butskoy  - 0.3.3-4
+- rebuild for FC5
+
 * Thu Feb  2 2006 Dmitry Butskoy  - 0.3.3-3
 - pam_usb-hotplug requires udev now instead of the obsoleted hotplug
 



From fedora-extras-commits at redhat.com  Wed Feb 15 12:24:37 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Wed, 15 Feb 2006 07:24:37 -0500
Subject: rpms/phpldapadmin/devel phpldapadmin.spec,1.7,1.8
Message-ID: <200602151225.k1FCP9gc032570@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	phpldapadmin.spec 
Log Message:



Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- phpldapadmin.spec	18 Nov 2005 12:24:00 -0000	1.7
+++ phpldapadmin.spec	15 Feb 2006 12:24:37 -0000	1.8
@@ -1,7 +1,7 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
 Version: 0.9.7.2
-Release: 2
+Release: 3
 Group: Applications/Internet
 License: GPL
 URL: http://phpldapadmin.sourceforge.net
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Dmitry Butskoy  - 0.9.7.2-3
+- rebuild for FC5
+
 * Fri Nov 18 2005 Dmitry Butskoy  - 0.9.7.2-2
 - update upstream's tarball (was changed without version increment)
 - don't treat VERSION as doc file (#173513)



From fedora-extras-commits at redhat.com  Wed Feb 15 12:57:01 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Wed, 15 Feb 2006 07:57:01 -0500
Subject: rpms/gaim-meanwhile/devel gaim-meanwhile.spec,1.12,1.13
Message-ID: <200602151257.k1FCvXEo000316@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32767

Modified Files:
	gaim-meanwhile.spec 
Log Message:
bump for rebuild


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gaim-meanwhile.spec	23 Jan 2006 14:03:14 -0000	1.12
+++ gaim-meanwhile.spec	15 Feb 2006 12:57:01 -0000	1.13
@@ -7,7 +7,7 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 1.2.8-2
+- Bump release for FE5 rebuild
+
 * Mon Jan 23 2006 - jwboyer at jdub.homelinux.org 1.2.8-1
 - Update to latest release
 - Remove patches (in upstream)



From fedora-extras-commits at redhat.com  Wed Feb 15 14:43:24 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Feb 2006 09:43:24 -0500
Subject: rpms/nagios/FC-3 nagios.spec,1.5,1.6
Message-ID: <200602151443.k1FEhuop004628@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Log Message:
Had a bad scriptlet, on upgrade nagios would uninstall and reinstall itself from chkconfig.
NOTE: Upgrading to this will still cause nagios to be un and reinstalled.  But it won't happen
from here on out




Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/nagios.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nagios.spec	10 Feb 2006 04:42:12 -0000	1.5
+++ nagios.spec	15 Feb 2006 14:43:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.5.rc2%{?dist}
+Release: 0.6.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -115,8 +115,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} || :
@@ -154,6 +156,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Wed Feb 15 2006 Mike McGrath  2.0-0.6.rc2
+-Upgrade no longer uninstalls Nagios from chkconfig
+
 * Tue Feb 09 2006 Mike McGrath  2.0-0.5.rc2
 - Made /private/* group owner Nagios.  This fixes SIGHUP config read issue.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 14:43:29 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Feb 2006 09:43:29 -0500
Subject: rpms/nagios/FC-4 nagios.spec,1.7,1.8
Message-ID: <200602151444.k1FEi2LA004631@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Log Message:
Had a bad scriptlet, on upgrade nagios would uninstall and reinstall itself from chkconfig.
NOTE: Upgrading to this will still cause nagios to be un and reinstalled.  But it won't happen
from here on out




Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nagios.spec	10 Feb 2006 04:42:18 -0000	1.7
+++ nagios.spec	15 Feb 2006 14:43:29 -0000	1.8
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.4.rc2%{?dist}
+Release: 0.6.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -115,8 +115,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} || :
@@ -154,6 +156,12 @@
 %{_includedir}/%{name}
 
 %changelog
+* Wed Feb 15 2006 Mike McGrath  2.0-0.6.rc2
+-Upgrade no longer uninstalls Nagios from chkconfig
+
+* Tue Feb 14 2006 Mike McGrath  2.0-0.5.rc2
+-Rebuild for Fedora Extras 5
+
 * Tue Feb 09 2006 Mike McGrath  2.0-0.4.rc2
 - Made /private/* group owner Nagios.  This fixes SIGHUP config read issue.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 14:43:35 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Feb 2006 09:43:35 -0500
Subject: rpms/nagios/devel nagios.spec,1.8,1.9
Message-ID: <200602151444.k1FEi7MR004634@cvs-int.fedora.redhat.com>

Author: mmcgrath

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

Modified Files:
	nagios.spec 
Log Message:
Had a bad scriptlet, on upgrade nagios would uninstall and reinstall itself from chkconfig.
NOTE: Upgrading to this will still cause nagios to be un and reinstalled.  But it won't happen
from here on out




Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nagios.spec	14 Feb 2006 13:05:27 -0000	1.8
+++ nagios.spec	15 Feb 2006 14:43:35 -0000	1.9
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.5.rc2%{?dist}
+Release: 0.6.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -115,8 +115,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} || :
@@ -154,6 +156,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Wed Feb 15 2006 Mike McGrath  2.0-0.6.rc2
+-Upgrade no longer uninstalls Nagios from chkconfig
+
 * Tue Feb 14 2006 Mike McGrath  2.0-0.5.rc2
 -Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:07:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 15 Feb 2006 10:07:06 -0500
Subject: rpms/nethack/devel nethack.spec,1.11,1.12
Message-ID: <200602151507.k1FF7cG3006604@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Log Message:
add groff to buildrequires


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nethack.spec	14 Feb 2006 23:21:01 -0000	1.11
+++ nethack.spec	15 Feb 2006 15:07:05 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -16,7 +16,7 @@
 Patch2:         %{name}-%{version}-x11.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel
+BuildRequires:  ncurses-devel, groff
 BuildRequires:  bison, flex, desktop-file-utils
 BuildRequires:  bdftopcf, mkfontdir, libX11-devel, libXaw-devel, libXext-devel
 BuildRequires:  libXmu-devel, libXpm-devel, libXt-devel
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Luke Macken  3.4.3-8
+- Add groff to BuildRequires
+
 * Tue Feb 14 2006 Luke Macken  3.4.3-7
 - Rebuild for FE5
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:26:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 15 Feb 2006 10:26:55 -0500
Subject: rpms/tidy/devel tidy.spec,1.15,1.16
Message-ID: <200602151527.k1FFRRwb006856@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	tidy.spec 
Log Message:
* Wed Feb 15 2006 Rex Dieter  
- fc5: gcc/glibc respin



Index: tidy.spec
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tidy.spec	10 Feb 2006 13:18:06 -0000	1.15
+++ tidy.spec	15 Feb 2006 15:26:54 -0000	1.16
@@ -4,7 +4,7 @@
 Name:    tidy
 Summary: Utility to clean up and pretty print HTML/XHTML/XML
 Version: 0.99.0
-Release: 9.20051025%{?dist}.1
+Release: 9.20051025%{?dist}.2
 
 Group:   Applications/Text
 License: W3C Software License
@@ -112,7 +112,7 @@
 
 
 %changelog
-* Fri Feb 10 2006 Rex Dieter 
+* Wed Feb 15 2006 Rex Dieter  
 - fc5: gcc/glibc respin
 
 * Fri Jan 20 2006 Rex Dieter  0.99.0-9.20051025



From fedora-extras-commits at redhat.com  Wed Feb 15 15:31:34 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 15 Feb 2006 10:31:34 -0500
Subject: rpms/xboard/devel xboard.spec,1.4,1.5
Message-ID: <200602151532.k1FFW6BC006989@cvs-int.fedora.redhat.com>

Author: kaboom

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

Modified Files:
	xboard.spec 
Log Message:
Update for modular X



Index: xboard.spec
===================================================================
RCS file: /cvs/extras/rpms/xboard/devel/xboard.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xboard.spec	16 Jun 2005 16:11:10 -0000	1.4
+++ xboard.spec	15 Feb 2006 15:31:34 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: An X Window System graphical chessboard
 Name: xboard
 Version: 4.2.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Amusements/Games
 URL: http://www.tim-mann.org/xboard.html
 Source: ftp://ftp.gnu.org/pub/gnu/xboard/xboard-%{version}.tar.gz
@@ -14,7 +14,10 @@
 Requires(post): info
 Requires(preun): info
 BuildRequires: desktop-file-utils >= 0.2.93
-BuildRequires: xorg-x11-devel texinfo
+BuildRequires: texinfo
+BuildRequires: xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel
+BuildRequires: libXaw-devel, libXt-devel, xorg-x11-proto-devel
+BuildRequires: libXpm-devel, libXext-devel
 
 %description
 Xboard is an X Window System based graphical chessboard which can be
@@ -76,6 +79,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Feb 15 2006 Chris Ricker  4.2.7-12
+- Update for modular X
+
 * Thu Jun 16 2005 Chris Ricker  4.2.7-11%{?dist}
 - Add more categories to desktop file (BZ #160476)
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:32:44 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 15 Feb 2006 10:32:44 -0500
Subject: rpms/lincvs/FC-4 .cvsignore, 1.4, 1.5 lincvs.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <200602151533.k1FFXGSu007016@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    Update to new upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 May 2005 21:32:12 -0000	1.4
+++ .cvsignore	15 Feb 2006 15:32:44 -0000	1.5
@@ -1 +1 @@
-lincvs-1.4.1-0-generic-src.tgz
+lincvs-1.4.4-0-generic-src.tgz


Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-4/lincvs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lincvs.spec	25 May 2005 21:32:12 -0000	1.9
+++ lincvs.spec	15 Feb 2006 15:32:44 -0000	1.10
@@ -1,5 +1,5 @@
 Name:             lincvs
-Version:          1.4.1
+Version:          1.4.4
 Release:          1
 
 Summary:          Graphical CVS Client
@@ -7,7 +7,7 @@
 Group:            Development/Tools
 License:          GPL
 URL:              http://www.lincvs.org
-Source0:          http://lincvs.com/download/lincvs-1.4.1-0-generic-src.tgz
+Source0:          http://lincvs.com/download/lincvs-%{version}-0-generic-src.tgz
 Source1:          lincvs.desktop
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -17,9 +17,20 @@
 Requires:         cvs >= 0:1.9.0
 
 %description
-LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows ato load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible.
-
-To keep LinCVS independant of the cvs version, LinCVS uses the local but separat installed cvs and therewith always should work with the latest version.
+LinCVS is a graphical Interface for the cvs client commandline tool 
+on the Unix and Windows platform. It allows ato load modules from a 
+server (checkout), create modules on the server (import), as well as 
+checking the state of directories and individual files or 
+updating them. Basic operations like add, remove and commit are 
+supported as matter of course, just like showing the actual differences 
+between the server version and the local sandbox, graphical display of 
+the version tree, and manifoldy graphical support of project maintenance. 
+All actions are logged on the cvs server (configurable via history), 
+and are therewith comprehensible.
+
+To keep LinCVS independent of the cvs version, LinCVS uses the local 
+but separat installed cvs and therewith always should work with the 
+latest version.
 
 
 %prep
@@ -68,6 +79,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Jochen Schmitt  1.4.4-1
+- Update to 1.4.4
+
 * Wed May 25 2005 Jeremy Katz  - 1.4.1-1
 - update to 1.4.1
 - BR desktop-file-utils (#156234)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 May 2005 21:32:12 -0000	1.4
+++ sources	15 Feb 2006 15:32:44 -0000	1.5
@@ -1 +1 @@
-59d0ad70c98c11123334e08cf008ff33  lincvs-1.4.1-0-generic-src.tgz
+e5bdeeffb2511579b0c9ba3e33f636e8  lincvs-1.4.4-0-generic-src.tgz



From fedora-extras-commits at redhat.com  Wed Feb 15 15:35:36 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 15 Feb 2006 10:35:36 -0500
Subject: rpms/lincvs/devel lincvs-1.4.4-gcc41.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 lincvs.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <200602151536.k1FFa8YY007135@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	.cvsignore lincvs.spec sources 
Added Files:
	lincvs-1.4.4-gcc41.patch 
Log Message:

  Description:
    - Update to new upstream relase.
    - Add gcc41 patch.


lincvs-1.4.4-gcc41.patch:

--- NEW FILE lincvs-1.4.4-gcc41.patch ---
--- lincvs-1.4.4/src/PixmapTimer.h.org	2006-02-14 22:33:09.000000000 +0100
+++ lincvs-1.4.4/src/PixmapTimer.h	2006-02-14 22:34:09.000000000 +0100
@@ -84,7 +84,7 @@
 
 public:
 	CPixmapTimer(QObject * parent = 0, const char * name = 0);
-	CPixmapTimer::~CPixmapTimer();
+	~CPixmapTimer();
 
 signals:
 	void signalTimeout(const QPixmap &);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 May 2005 21:32:12 -0000	1.4
+++ .cvsignore	15 Feb 2006 15:35:35 -0000	1.5
@@ -1 +1 @@
-lincvs-1.4.1-0-generic-src.tgz
+lincvs-1.4.4-0-generic-src.tgz


Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/lincvs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lincvs.spec	27 Jul 2005 08:30:02 -0000	1.10
+++ lincvs.spec	15 Feb 2006 15:35:35 -0000	1.11
@@ -1,5 +1,5 @@
 Name:             lincvs
-Version:          1.4.1
+Version:          1.4.4
 Release:          1
 
 Summary:          Graphical CVS Client
@@ -7,8 +7,9 @@
 Group:            Development/Tools
 License:          GPL
 URL:              http://www.lincvs.org
-Source0:          http://lincvs.com/download/lincvs-1.4.1-0-generic-src.tgz
+Source0:          http://lincvs.com/download/lincvs-%{version}-0-generic-src.tgz
 Source1:          lincvs.desktop
+Patch0:		  lincvs-1.4.4-gcc41.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:    cvs >= 0:1.9.0
@@ -17,13 +18,25 @@
 Requires:         cvs >= 0:1.9.0
 
 %description
-LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows to load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible.
-
-To keep LinCVS independant of the cvs version, LinCVS uses the local but separat installed cvs and therewith always should work with the latest version.
+LinCVS is a graphical Interface for the cvs client commandline tool 
+on the Unix and Windows platform. It allows ato load modules from a 
+server (checkout), create modules on the server (import), as well as 
+checking the state of directories and individual files or 
+updating them. Basic operations like add, remove and commit are 
+supported as matter of course, just like showing the actual differences 
+between the server version and the local sandbox, graphical display of 
+the version tree, and manifoldy graphical support of project maintenance. 
+All actions are logged on the cvs server (configurable via history), 
+and are therewith comprehensible.
+
+To keep LinCVS independent of the cvs version, LinCVS uses the local 
+but separat installed cvs and therewith always should work with the 
+latest version.
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .org
 
 cat <<'EOF' >lincvs.sh
 #!/bin/sh
@@ -68,6 +81,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Jochen Schmitt  1.4.4-1
+- Update to 1.4.4
+
 * Wed May 25 2005 Jeremy Katz  - 1.4.1-1
 - update to 1.4.1
 - BR desktop-file-utils (#156234)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 May 2005 21:32:12 -0000	1.4
+++ sources	15 Feb 2006 15:35:35 -0000	1.5
@@ -1 +1 @@
-59d0ad70c98c11123334e08cf008ff33  lincvs-1.4.1-0-generic-src.tgz
+e5bdeeffb2511579b0c9ba3e33f636e8  lincvs-1.4.4-0-generic-src.tgz



From fedora-extras-commits at redhat.com  Wed Feb 15 15:40:48 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 15 Feb 2006 10:40:48 -0500
Subject: rpms/ppracer/FC-4 ppracer.spec,1.12,1.13
Message-ID: <200602151541.k1FFfKc2007231@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Log Message:
avoid hardcoded rpath (#173818, fix by Thorsten Leemhuis)



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/FC-4/ppracer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ppracer.spec	16 Mar 2005 12:27:22 -0000	1.12
+++ ppracer.spec	15 Feb 2006 15:40:47 -0000	1.13
@@ -6,7 +6,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 4
+Release: 4.fc4.1
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -28,6 +28,8 @@
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
+BuildRequires: findutils sed
+
 Obsoletes: tuxracer <= 0.61
 
 %description
@@ -44,6 +46,8 @@
 %build
 autoconf
 %configure --with-data-dir=%{_datadir}/ppracer
+## avoid hardcoded rpath
+sed -i 's|-Wl,--rpath -Wl,/usr/lib64 ||' $(find . -name 'Makefile')
 make %{?_smp_mflags}
 
 %install
@@ -69,6 +73,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Wed Feb 15 2006 Nils Philippsen 
+- avoid hardcoded rpath (#173818, fix by Thorsten Leemhuis)
+
 * Wed Mar 16 2005 Nils Philippsen 
 - look in .../lib64 as well for tclConfig.sh
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:41:14 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 15 Feb 2006 10:41:14 -0500
Subject: rpms/lincvs/devel lincvs.spec,1.11,1.12
Message-ID: <200602151541.k1FFfkin007240@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	lincvs.spec 
Log Message:

   Description:
    Add %{?dist} to Release:



Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/devel/lincvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lincvs.spec	15 Feb 2006 15:35:35 -0000	1.11
+++ lincvs.spec	15 Feb 2006 15:41:14 -0000	1.12
@@ -1,6 +1,6 @@
 Name:             lincvs
 Version:          1.4.4
-Release:          1
+Release:          1%{?dist}
 
 Summary:          Graphical CVS Client
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:43:23 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 15 Feb 2006 10:43:23 -0500
Subject: rpms/lincvs/FC-4 lincvs.spec,1.10,1.11
Message-ID: <200602151543.k1FFhtw0007358@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7339

Modified Files:
	lincvs.spec 
Log Message:

  Description:
    Add %{?dist} to Release: tag.



Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-4/lincvs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lincvs.spec	15 Feb 2006 15:32:44 -0000	1.10
+++ lincvs.spec	15 Feb 2006 15:43:23 -0000	1.11
@@ -1,6 +1,6 @@
 Name:             lincvs
 Version:          1.4.4
-Release:          1
+Release:          1${?dist}
 
 Summary:          Graphical CVS Client
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:46:01 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 15 Feb 2006 10:46:01 -0500
Subject: rpms/lincvs/FC-4 lincvs.spec,1.11,1.12
Message-ID: <200602151546.k1FFkXJB007411@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7389

Modified Files:
	lincvs.spec 
Log Message:

  Description:
    Fixed typo in Relase tag.



Index: lincvs.spec
===================================================================
RCS file: /cvs/extras/rpms/lincvs/FC-4/lincvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lincvs.spec	15 Feb 2006 15:43:23 -0000	1.11
+++ lincvs.spec	15 Feb 2006 15:46:00 -0000	1.12
@@ -1,6 +1,6 @@
 Name:             lincvs
 Version:          1.4.4
-Release:          1${?dist}
+Release:          1%{?dist}
 
 Summary:          Graphical CVS Client
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:52:23 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 15 Feb 2006 10:52:23 -0500
Subject: rpms/bazaar/FC-3 bazaar.spec,1.10,1.11
Message-ID: <200602151552.k1FFqtpC007499@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/bazaar/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7448/FC-3

Modified Files:
	bazaar.spec 
Log Message:
Rebuild (devel) for FC5; keep other spec files in sync



Index: bazaar.spec
===================================================================
RCS file: /cvs/extras/rpms/bazaar/FC-3/bazaar.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bazaar.spec	1 Feb 2006 17:12:45 -0000	1.10
+++ bazaar.spec	15 Feb 2006 15:52:23 -0000	1.11
@@ -1,11 +1,12 @@
 Name:       bazaar
 Version:    1.4.2
 Summary:    A distributed revision control system
-Release:    4%{?dist}
+Release:    6%{?dist}
 License:    GPL
 Group:      Development/Tools
 Source:     http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz
 Source1:    http://bazaar.canonical.com/releases/src/bazaar-doc_1.4.tar.gz
+Patch0:     bazaar-neon-escape.patch
 URL:        http://bazaar.canonical.com/
 
 BuildRequires: neon-devel which gettext gpgme-devel python-docutils tetex-latex
@@ -25,6 +26,7 @@
 %prep
 # unpack the source
 %setup -q -n thelove at canonical.com---dists--bazaar--1.4
+%patch0 -p1
 # unpack the documentation
 %setup -q -n thelove at canonical.com---dists--bazaar--1.4 -D -T -a 1
 
@@ -82,6 +84,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Feb 15 2006 Shahms E. King  1.4.2-6
+- Rebuild for FC5
+
+* Fri Feb 10 2006 Shahms E. King  1.4.2-5
+- Fix for changes in ne_path_escape
+
 * Wed Feb 01 2006 Shahms E. King  1.4.2-4
 - Rebuild against new neon
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:52:29 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 15 Feb 2006 10:52:29 -0500
Subject: rpms/bazaar/FC-4 bazaar.spec,1.11,1.12
Message-ID: <200602151553.k1FFr13h007502@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/bazaar/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7448/FC-4

Modified Files:
	bazaar.spec 
Log Message:
Rebuild (devel) for FC5; keep other spec files in sync



Index: bazaar.spec
===================================================================
RCS file: /cvs/extras/rpms/bazaar/FC-4/bazaar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bazaar.spec	1 Feb 2006 17:12:52 -0000	1.11
+++ bazaar.spec	15 Feb 2006 15:52:28 -0000	1.12
@@ -1,11 +1,12 @@
 Name:       bazaar
 Version:    1.4.2
 Summary:    A distributed revision control system
-Release:    4%{?dist}
+Release:    6%{?dist}
 License:    GPL
 Group:      Development/Tools
 Source:     http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz
 Source1:    http://bazaar.canonical.com/releases/src/bazaar-doc_1.4.tar.gz
+Patch0:     bazaar-neon-escape.patch
 URL:        http://bazaar.canonical.com/
 
 BuildRequires: neon-devel which gettext gpgme-devel python-docutils tetex-latex
@@ -25,6 +26,7 @@
 %prep
 # unpack the source
 %setup -q -n thelove at canonical.com---dists--bazaar--1.4
+%patch0 -p1
 # unpack the documentation
 %setup -q -n thelove at canonical.com---dists--bazaar--1.4 -D -T -a 1
 
@@ -82,6 +84,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Feb 15 2006 Shahms E. King  1.4.2-6
+- Rebuild for FC5
+
+* Fri Feb 10 2006 Shahms E. King  1.4.2-5
+- Fix for changes in ne_path_escape
+
 * Wed Feb 01 2006 Shahms E. King  1.4.2-4
 - Rebuild against new neon
 



From fedora-extras-commits at redhat.com  Wed Feb 15 15:52:34 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 15 Feb 2006 10:52:34 -0500
Subject: rpms/bazaar/devel bazaar.spec,1.12,1.13
Message-ID: <200602151553.k1FFr7Bf007514@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/bazaar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7448/devel

Modified Files:
	bazaar.spec 
Log Message:
Rebuild (devel) for FC5; keep other spec files in sync



Index: bazaar.spec
===================================================================
RCS file: /cvs/extras/rpms/bazaar/devel/bazaar.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bazaar.spec	10 Feb 2006 22:30:48 -0000	1.12
+++ bazaar.spec	15 Feb 2006 15:52:34 -0000	1.13
@@ -1,7 +1,7 @@
 Name:       bazaar
 Version:    1.4.2
 Summary:    A distributed revision control system
-Release:    5%{?dist}
+Release:    6%{?dist}
 License:    GPL
 Group:      Development/Tools
 Source:     http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Feb 15 2006 Shahms E. King  1.4.2-6
+- Rebuild for FC5
+
 * Fri Feb 10 2006 Shahms E. King  1.4.2-5
 - Fix for changes in ne_path_escape
 



From fedora-extras-commits at redhat.com  Wed Feb 15 16:32:11 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 15 Feb 2006 11:32:11 -0500
Subject: rpms/ufsparse/devel ufsparse.spec,1.10,1.11
Message-ID: <200602151632.k1FGWh1V009607@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9590

Modified Files:
	ufsparse.spec 
Log Message:
Rebuild for FC5.


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ufsparse.spec	9 Feb 2006 16:42:46 -0000	1.10
+++ ufsparse.spec	15 Feb 2006 16:32:11 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ufsparse
 Version:        0.93
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        University of Florida sparse matrix libraries
 
 Group:          System Environment/Libraries
@@ -232,6 +232,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Feb 15 2006 Quentin Spencer  0.93-2
+- Rebuild for Fedora Extras 5.
+
 * Thu Feb  9 2006 Quentin Spencer  0.93-1
 - New release. Remove old patch.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 16:56:41 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 15 Feb 2006 11:56:41 -0500
Subject: rpms/yumex/devel .cvsignore, 1.14, 1.15 sources, 1.17,
	1.18 yumex.spec, 1.18, 1.19
Message-ID: <200602151657.k1FGvDAi009816@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9788

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
release 0.99.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	14 Feb 2006 14:34:22 -0000	1.14
+++ .cvsignore	15 Feb 2006 16:56:41 -0000	1.15
@@ -1 +1 @@
-yumex-0.99.8.tar.gz
+yumex-0.99.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	14 Feb 2006 14:34:22 -0000	1.17
+++ sources	15 Feb 2006 16:56:41 -0000	1.18
@@ -1 +1 @@
-f65540baf9646f457dfd670e5b31349a  yumex-0.99.8.tar.gz
+6042cccf70692e2b96ae76046d2c175c  yumex-0.99.9.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- yumex.spec	14 Feb 2006 14:34:22 -0000	1.18
+++ yumex.spec	15 Feb 2006 16:56:41 -0000	1.19
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.8
+Version:  0.99.9
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Wed Feb 15 17:02:36 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Wed, 15 Feb 2006 12:02:36 -0500
Subject: rpms/alacarte/devel alacarte.spec,1.2,1.3
Message-ID: <200602151703.k1FH3GTo011773@cvs-int.fedora.redhat.com>

Author: jpmahowa

Update of /cvs/extras/rpms/alacarte/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11733

Modified Files:
	alacarte.spec 
Log Message:
* Wed Feb 15 2006 John Mahowald  - 0.8-7
- Rebuild for Fedora Extras 5



Index: alacarte.spec
===================================================================
RCS file: /cvs/extras/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alacarte.spec	15 Feb 2006 07:18:03 -0000	1.2
+++ alacarte.spec	15 Feb 2006 17:02:36 -0000	1.3
@@ -1,11 +1,9 @@
-%{!?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_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:           alacarte
 Version:        0.8
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Simple menu editor for GNOME
 
 Group:          Applications/System
@@ -57,7 +55,7 @@
 
 
 %changelog
-* Wed Feb 15 2006 John Mahowald  - 0.8-5
+* Wed Feb 15 2006 John Mahowald  - 0.8-7
 - Rebuild for Fedora Extras 5
 
 * Fri Feb 3 2006  John Mahowald  - 0.8-3



From fedora-extras-commits at redhat.com  Wed Feb 15 17:03:57 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:03:57 -0500
Subject: extras-buildsys/server main.py,1.17,1.18
Message-ID: <200602151703.k1FH3v1D011816@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11781/server

Modified Files:
	main.py 
Log Message:
2006-02-15  Dan Williams  

    * server/main.py
        - remove pidfile on exit




Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- main.py	29 Nov 2005 06:41:51 -0000	1.17
+++ main.py	15 Feb 2006 17:03:30 -0000	1.18
@@ -167,6 +167,9 @@
         srpm_server.stop()
         tbs.stop()
 
+    if opts.pidfile:
+        os.unlink(opts.pidfile)
+
     print "Done."
     os._exit(0)
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:03:32 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:03:32 -0500
Subject: extras-buildsys ChangeLog,1.161,1.162
Message-ID: <200602151704.k1FH42xY011852@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11781

Modified Files:
	ChangeLog 
Log Message:
2006-02-15  Dan Williams  

    * server/main.py
        - remove pidfile on exit




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- ChangeLog	24 Jan 2006 17:39:23 -0000	1.161
+++ ChangeLog	15 Feb 2006 17:03:23 -0000	1.162
@@ -1,3 +1,8 @@
+2006-02-15  Dan Williams  
+
+    * server/main.py
+        - remove pidfile on exit
+
 2006-01-24  Dan Williams  
 
     * common/ExecUtils.py



From fedora-extras-commits at redhat.com  Wed Feb 15 17:05:03 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 15 Feb 2006 12:05:03 -0500
Subject: rpms/xdaliclock/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xdaliclock.spec, 1.2, 1.3
Message-ID: <200602151705.k1FH5cL5011910@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/rpms/xdaliclock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11882

Modified Files:
	.cvsignore sources xdaliclock.spec 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdaliclock/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 May 2005 18:07:22 -0000	1.2
+++ .cvsignore	15 Feb 2006 17:05:03 -0000	1.3
@@ -1 +1 @@
-xdaliclock-2.20.tar.gz
+xdaliclock-2.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdaliclock/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 May 2005 18:07:22 -0000	1.2
+++ sources	15 Feb 2006 17:05:03 -0000	1.3
@@ -1 +1 @@
-be9642cc711a8d93ff13faac0cf4f306  xdaliclock-2.20.tar.gz
+1c16ce93d8da5c1f10d462108695042c  xdaliclock-2.23.tar.gz


Index: xdaliclock.spec
===================================================================
RCS file: /cvs/extras/rpms/xdaliclock/devel/xdaliclock.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdaliclock.spec	9 May 2005 18:49:54 -0000	1.2
+++ xdaliclock.spec	15 Feb 2006 17:05:03 -0000	1.3
@@ -1,15 +1,16 @@
 Summary: A clock for the X Window System
 Name: xdaliclock
-Version: 2.20
-Release: 2%{?dist}
+Version: 2.23
+Release: 1%{?dist}
 Group: Amusements/Graphics
 License: BSD
 URL: http://www.jwz.org/xdaliclock/
 Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz
 Source1: xdaliclock.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel
 BuildRequires: desktop-file-utils
+BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel
+BuildRequires: libXext-devel, libXaw-devel, libXt-devel
 
 %description
 XDaliClock is a large digital clock for the X Window System, with digits
@@ -59,6 +60,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Feb 15 2006 Chris Ricker  2.23-1
+- New release
+- Update for modular X
+
 * Mon May 09 2005 Chris Ricker  2.20-2%{?dist}
 - Add dist tag
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:05:40 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 15 Feb 2006 12:05:40 -0500
Subject: rpms/fftw/FC-4 fftw.spec,1.12,1.13
Message-ID: <200602151706.k1FH6CJK011971@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fftw/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11917

Modified Files:
	fftw.spec 
Log Message:
Fix bug 181628. Disable static libs. Other specfile cleanups.


Index: fftw.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw/FC-4/fftw.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fftw.spec	13 Feb 2006 21:35:04 -0000	1.12
+++ fftw.spec	15 Feb 2006 17:05:40 -0000	1.13
@@ -12,6 +12,8 @@
 BuildRequires:  gcc-gfortran
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Obsoletes:      fftw3
+
 
 %description
 FFTW is a C subroutine library for computing the Discrete Fourier
@@ -23,6 +25,7 @@
 Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Obsoletes:      fftw3-devel
 
 
 %description    devel
@@ -102,6 +105,7 @@
 
 %changelog
 * Mon Feb 13 2006 Quentin Spencer  3.1-2
+- Obsolete fftw3 (bug 181628).
 - Disable static libs.
 - Remove obsolete configure options.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:07:22 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:07:22 -0500
Subject: extras-buildsys ChangeLog,1.162,1.163
Message-ID: <200602151707.k1FH7Mtd012061@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12023

Modified Files:
	ChangeLog 
Log Message:
2006-02-15  Dan Williams  

    * common/XMLRPCServerProxy.py
        - Fix up some of the test code




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- ChangeLog	15 Feb 2006 17:03:23 -0000	1.162
+++ ChangeLog	15 Feb 2006 17:07:13 -0000	1.163
@@ -1,5 +1,10 @@
 2006-02-15  Dan Williams  
 
+    * common/XMLRPCServerProxy.py
+        - Fix up some of the test code
+
+2006-02-15  Dan Williams  
+
     * server/main.py
         - remove pidfile on exit
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:07:15 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:07:15 -0500
Subject: extras-buildsys/common XMLRPCServerProxy.py,1.8,1.9
Message-ID: <200602151707.k1FH7klp012068@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12023/common

Modified Files:
	XMLRPCServerProxy.py 
Log Message:
2006-02-15  Dan Williams  

    * common/XMLRPCServerProxy.py
        - Fix up some of the test code




Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLRPCServerProxy.py	1 Dec 2005 04:18:24 -0000	1.8
+++ XMLRPCServerProxy.py	15 Feb 2006 17:07:07 -0000	1.9
@@ -65,12 +65,12 @@
 
 threadlist_lock = threading.Lock()
 threadlist = {}
-timed_out = 0
 
 class TestClient(threading.Thread):
-    def __init__(self, certs, num):
+    def __init__(self, certs, num, tm):
         self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20)
         self.num = i
+        self.tm = tm
         threading.Thread.__init__(self)
 
     def run(self):
@@ -86,7 +86,7 @@
             except socket.timeout, e:
                 reply = "Socket timeout (%s)" % e
                 threadlist_lock.acquire()
-                timed_out = timed_out + 1
+                self.tm.inc()
                 threadlist_lock.release()
             print "TRY(%d / %d): %s" % (self.num, i, reply)
             time.sleep(0.05)
@@ -95,6 +95,18 @@
         del threadlist[self]
         threadlist_lock.release()
 
+class TimeoutCounter:
+    def __init__(self):
+        self._timedout = 0
+        self._lock = threading.Lock();
+
+    def inc(self):
+        self._lock.acquire()
+        self._timedout = self._timedout + 1
+        self._lock.release()
+
+    def get(self):
+        return self._timedout
 
 if __name__ == '__main__':
     if len(sys.argv) < 4:
@@ -106,9 +118,10 @@
     certs['ca_cert'] = sys.argv[2]
     certs['peer_ca_cert'] = sys.argv[3]
 
+    tm = TimeoutCounter()
     i = 100
     while i > 0:
-        t = TestClient(certs, i)
+        t = TestClient(certs, i, tm)
         threadlist[t] = None
         print "Created thread %d." % i
         t.start()
@@ -126,5 +139,5 @@
             threadlist_lock.release()
         except KeyboardInterrupt:
             os._exit(0)
-    print "All done. (%d timed out)" % timed_out
+    print "All done. (%d timed out)" % tm.get()
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:13:30 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:13:30 -0500
Subject: extras-buildsys/common SSLConnection.py,1.7,1.8
Message-ID: <200602151713.k1FHDUZ8012157@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12123/common

Modified Files:
	SSLConnection.py 
Log Message:
2006-02-15  Dan Williams  

    * common/SSLConnection.py
        - Don't use pyOpenSSL's sendall() call, since it simply
            calls SSL_write() in a loop.  Instead, we simulate the sendall
            ourselves, allowing us to honor socket timeouts and to not
            peg the CPU when we get WantReadError/WantWriteError exceptions due
            to non-blocking IO
        - Clean up the recv/sendall functions somewhat too
        - Add some cosmetic inter-function spacing
        - Increase WantReadError/WantWriteError sleeps from 0.1s -> 0.2s
        - Return valid socket error message on timeout




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SSLConnection.py	24 Jan 2006 01:19:01 -0000	1.7
+++ SSLConnection.py	15 Feb 2006 17:13:22 -0000	1.8
@@ -29,18 +29,23 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
+
     def __del__(self):
         self.__dict__["conn"].close()
+
     def __getattr__(self,name):
         return getattr(self.__dict__["conn"], name)
+
     def __setattr__(self,name, value):
         setattr(self.__dict__["conn"], name, value)
+
     def settimeout(self, timeout):
         if timeout == None:
             self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
         else:
             self.__dict__["timeout"] = timeout
         self.__dict__["conn"].settimeout(timeout)
+
     def shutdown(self, how=1):
         """
         SimpleXMLRpcServer.doPOST calls shutdown(1),
@@ -48,6 +53,7 @@
         an argument. So we just discard the argument.
         """
         self.__dict__["conn"].shutdown()
+
     def accept(self):
         """
         This is the other part of the shutdown() workaround.
@@ -56,6 +62,7 @@
         """
         c, a = self.__dict__["conn"].accept()
         return (SSLConnection(c), a)
+
     def makefile(self, mode, bufsize):
         """
         We need to use socket._fileobject Because SSL.Connection
@@ -68,6 +75,7 @@
         """
         self.__dict__["close_refcount"] = self.__dict__["close_refcount"] + 1
         return PlgFileObject(self, mode, bufsize)
+
     def close(self):
         if self.__dict__["closed"]:
             return
@@ -76,54 +84,66 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
+
     def sendall(self, data, flags=0):
-        while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in write:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].sendall(data, flags)
-                    except SSL.SysCallError, e:
-                        if e[0] == 32:      # Broken Pipe
-                            self.close()
-                        else:
-                            raise socket.error(e)
-                    except SSL.WantWriteError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
+        """
+        - Use select() to simulate a socket timeout without setting the socket
+            to non-blocking mode.
+        - Don't use pyOpenSSL's sendall() either, since it just loops on WantRead
+            or WantWrite, consuming 100% CPU, and never times out.
+        """
+        timeout = self.__dict__["timeout"]
+        con = self.__dict__["conn"]
+        (read, write, excpt) = select.select([], [con], [], timeout)
+        if not con in write:
+            raise socket.timeout((110, "Operation timed out."))
+
+        starttime = time.time()
+        origlen = len(data)
+        sent = -1
+        while len(data):
+            curtime = time.time()
+            if curtime - starttime > timeout:
+                raise socket.timeout((110, "Operation timed out."))
+
+            try:
+                sent = con.send(data, flags)
+            except SSL.SysCallError, e:
+                if e[0] == 32:      # Broken Pipe
+                    self.close()
+                    sent = 0
+                else:
+                    raise socket.error(e)
+            except (SSL.WantWriteError, SSL.WantReadError):
+                time.sleep(0.2)
+                continue
+
+            data = data[sent:]
+        return origlen - len(data)
+
     def recv(self, bufsize, flags=0):
+        """
+        Use select() to simulate a socket timeout without setting the socket
+        to non-blocking mode
+        """
+        timeout = self.__dict__["timeout"]
+        con = self.__dict__["conn"]
+        (read, write, excpt) = select.select([con], [], [], timeout)
+        if not con in read:
+            raise socket.timeout((110, "Operation timed out."))
+
+        starttime = time.time()
         while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in read:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].recv(bufsize, flags)
-                    except SSL.ZeroReturnError:
-                        return None
-                    except SSL.WantReadError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
+            curtime = time.time()
+            if curtime - starttime > timeout:
+                raise socket.timeout((110, "Operation timed out."))
+
+            try:
+                return con.recv(bufsize, flags)
+            except SSL.ZeroReturnError:
+                return None
+            except SSL.WantReadError:
+                time.sleep(0.2)
         return None
 
 class PlgFileObject(socket._fileobject):



From fedora-extras-commits at redhat.com  Wed Feb 15 17:13:24 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:13:24 -0500
Subject: extras-buildsys ChangeLog,1.163,1.164
Message-ID: <200602151713.k1FHDtIF012160@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12123

Modified Files:
	ChangeLog 
Log Message:
2006-02-15  Dan Williams  

    * common/SSLConnection.py
        - Don't use pyOpenSSL's sendall() call, since it simply
            calls SSL_write() in a loop.  Instead, we simulate the sendall
            ourselves, allowing us to honor socket timeouts and to not
            peg the CPU when we get WantReadError/WantWriteError exceptions due
            to non-blocking IO
        - Clean up the recv/sendall functions somewhat too
        - Add some cosmetic inter-function spacing
        - Increase WantReadError/WantWriteError sleeps from 0.1s -> 0.2s
        - Return valid socket error message on timeout




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- ChangeLog	15 Feb 2006 17:07:13 -0000	1.163
+++ ChangeLog	15 Feb 2006 17:13:17 -0000	1.164
@@ -1,5 +1,18 @@
 2006-02-15  Dan Williams  
 
+    * common/SSLConnection.py
+        - Don't use pyOpenSSL's sendall() call, since it simply
+            calls SSL_write() in a loop.  Instead, we simulate the sendall
+            ourselves, allowing us to honor socket timeouts and to not
+            peg the CPU when we get WantReadError/WantWriteError exceptions due
+            to non-blocking IO
+        - Clean up the recv/sendall functions somewhat too
+        - Add some cosmetic inter-function spacing
+        - Increase WantReadError/WantWriteError sleeps from 0.1s -> 0.2s
+        - Return valid socket error message on timeout
+
+2006-02-15  Dan Williams  
+
     * common/XMLRPCServerProxy.py
         - Fix up some of the test code
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:14:58 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:14:58 -0500
Subject: extras-buildsys/server main.py,1.14.2.2,1.14.2.3
Message-ID: <200602151714.k1FHEwFq012215@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12178/server

Modified Files:
      Tag: STABLE_0_4
	main.py 
Log Message:
2006-02-15  Dan Williams  

    * server/main.py
        - remove pidfile on exit




Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- main.py	29 Nov 2005 06:36:44 -0000	1.14.2.2
+++ main.py	15 Feb 2006 17:14:50 -0000	1.14.2.3
@@ -167,6 +167,9 @@
         srpm_server.stop()
         tbs.stop()
 
+    if opts.pidfile:
+        os.unlink(opts.pidfile)
+
     print "Done."
     os._exit(0)
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:14:52 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:14:52 -0500
Subject: extras-buildsys ChangeLog,1.126.2.32,1.126.2.33
Message-ID: <200602151715.k1FHFMVI012220@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12178

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-02-15  Dan Williams  

    * server/main.py
        - remove pidfile on exit




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.32
retrieving revision 1.126.2.33
diff -u -r1.126.2.32 -r1.126.2.33
--- ChangeLog	24 Jan 2006 17:45:26 -0000	1.126.2.32
+++ ChangeLog	15 Feb 2006 17:14:45 -0000	1.126.2.33
@@ -1,3 +1,8 @@
+2006-02-15  Dan Williams  
+
+    * server/main.py
+        - remove pidfile on exit
+
 2006-01-24  Dan Williams  
 
     * common/ExecUtils.py



From fedora-extras-commits at redhat.com  Wed Feb 15 17:16:33 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:16:33 -0500
Subject: extras-buildsys/common XMLRPCServerProxy.py,1.5.4.3,1.5.4.4
Message-ID: <200602151716.k1FHGXkj012317@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12238/common

Modified Files:
      Tag: STABLE_0_4
	XMLRPCServerProxy.py 
Log Message:
2006-02-15  Dan Williams  

    * common/XMLRPCServerProxy.py
        - Fix up some of the test code




Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -u -r1.5.4.3 -r1.5.4.4
--- XMLRPCServerProxy.py	1 Dec 2005 04:18:55 -0000	1.5.4.3
+++ XMLRPCServerProxy.py	15 Feb 2006 17:16:25 -0000	1.5.4.4
@@ -65,12 +65,12 @@
 
 threadlist_lock = threading.Lock()
 threadlist = {}
-timed_out = 0
 
 class TestClient(threading.Thread):
-    def __init__(self, certs, num):
+    def __init__(self, certs, num, tm):
         self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20)
         self.num = i
+        self.tm = tm
         threading.Thread.__init__(self)
 
     def run(self):
@@ -86,7 +86,7 @@
             except socket.timeout, e:
                 reply = "Socket timeout (%s)" % e
                 threadlist_lock.acquire()
-                timed_out = timed_out + 1
+                self.tm.inc()
                 threadlist_lock.release()
             print "TRY(%d / %d): %s" % (self.num, i, reply)
             time.sleep(0.05)
@@ -95,6 +95,18 @@
         del threadlist[self]
         threadlist_lock.release()
 
+class TimeoutCounter:
+    def __init__(self):
+        self._timedout = 0
+        self._lock = threading.Lock();
+
+    def inc(self):
+        self._lock.acquire()
+        self._timedout = self._timedout + 1
+        self._lock.release()
+
+    def get(self):
+        return self._timedout
 
 if __name__ == '__main__':
     if len(sys.argv) < 4:
@@ -106,9 +118,10 @@
     certs['ca_cert'] = sys.argv[2]
     certs['peer_ca_cert'] = sys.argv[3]
 
+    tm = TimeoutCounter()
     i = 100
     while i > 0:
-        t = TestClient(certs, i)
+        t = TestClient(certs, i, tm)
         threadlist[t] = None
         print "Created thread %d." % i
         t.start()
@@ -126,5 +139,5 @@
             threadlist_lock.release()
         except KeyboardInterrupt:
             os._exit(0)
-    print "All done. (%d timed out)" % timed_out
+    print "All done. (%d timed out)" % tm.get()
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:16:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 15 Feb 2006 12:16:26 -0500
Subject: rpms/python-numarray/FC-4 .cvsignore, 1.2, 1.3 python-numarray.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200602151716.k1FHGwNQ012325@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-numarray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12244

Modified Files:
	.cvsignore python-numarray.spec sources 
Log Message:
Update to 1.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 20:20:52 -0000	1.2
+++ .cvsignore	15 Feb 2006 17:16:25 -0000	1.3
@@ -1 +1 @@
-numarray-1.3.3.tar.gz
+numarray-1.5.1.tar.gz


Index: python-numarray.spec
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/FC-4/python-numarray.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-numarray.spec	11 Aug 2005 20:55:06 -0000	1.2
+++ python-numarray.spec	15 Feb 2006 17:16:25 -0000	1.3
@@ -3,8 +3,8 @@
 %{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
 
 Name:           python-numarray
-Version:        1.3.3
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Python array manipulation and computational library
 
 Group:          Development/Languages
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Wed Feb 15 2005 - Orion Poplawski  - 1.5.1-1
+- Update to 1.5.1
+
 * Thu Aug 11 2005 - Orion Poplawski  - 1.3.3-4
 - Use sitearch macro instead of sitelib
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 20:20:52 -0000	1.2
+++ sources	15 Feb 2006 17:16:25 -0000	1.3
@@ -1 +1 @@
-2286f5dbccebd4ba743915e9e1d30856  numarray-1.3.3.tar.gz
+e6c282b950f4383f294134424ae58f3b  numarray-1.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb 15 17:16:26 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:16:26 -0500
Subject: extras-buildsys ChangeLog,1.126.2.33,1.126.2.34
Message-ID: <200602151716.k1FHGvN1012322@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12238

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-02-15  Dan Williams  

    * common/XMLRPCServerProxy.py
        - Fix up some of the test code




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.33
retrieving revision 1.126.2.34
diff -u -r1.126.2.33 -r1.126.2.34
--- ChangeLog	15 Feb 2006 17:14:45 -0000	1.126.2.33
+++ ChangeLog	15 Feb 2006 17:16:18 -0000	1.126.2.34
@@ -1,5 +1,10 @@
 2006-02-15  Dan Williams  
 
+    * common/XMLRPCServerProxy.py
+        - Fix up some of the test code
+
+2006-02-15  Dan Williams  
+
     * server/main.py
         - remove pidfile on exit
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:17:46 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:17:46 -0500
Subject: extras-buildsys/common SSLConnection.py,1.3.4.4,1.3.4.5
Message-ID: <200602151717.k1FHHkYP012400@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12354/common

Modified Files:
      Tag: STABLE_0_4
	SSLConnection.py 
Log Message:
2006-02-15  Dan Williams  

    * common/SSLConnection.py
        - Don't use pyOpenSSL's sendall() call, since it simply
            calls SSL_write() in a loop.  Instead, we simulate the sendall
            ourselves, allowing us to honor socket timeouts and to not
            peg the CPU when we get WantReadError/WantWriteError exceptions due
            to non-blocking IO
        - Clean up the recv/sendall functions somewhat too
        - Add some cosmetic inter-function spacing
        - Increase WantReadError/WantWriteError sleeps from 0.1s -> 0.2s
        - Return valid socket error message on timeout




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -u -r1.3.4.4 -r1.3.4.5
--- SSLConnection.py	24 Jan 2006 01:12:41 -0000	1.3.4.4
+++ SSLConnection.py	15 Feb 2006 17:17:39 -0000	1.3.4.5
@@ -29,18 +29,23 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
+
     def __del__(self):
         self.__dict__["conn"].close()
+
     def __getattr__(self,name):
         return getattr(self.__dict__["conn"], name)
+
     def __setattr__(self,name, value):
         setattr(self.__dict__["conn"], name, value)
+
     def settimeout(self, timeout):
         if timeout == None:
             self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
         else:
             self.__dict__["timeout"] = timeout
         self.__dict__["conn"].settimeout(timeout)
+
     def shutdown(self, how=1):
         """
         SimpleXMLRpcServer.doPOST calls shutdown(1),
@@ -48,6 +53,7 @@
         an argument. So we just discard the argument.
         """
         self.__dict__["conn"].shutdown()
+
     def accept(self):
         """
         This is the other part of the shutdown() workaround.
@@ -56,6 +62,7 @@
         """
         c, a = self.__dict__["conn"].accept()
         return (SSLConnection(c), a)
+
     def makefile(self, mode, bufsize):
         """
         We need to use socket._fileobject Because SSL.Connection
@@ -68,6 +75,7 @@
         """
         self.__dict__["close_refcount"] = self.__dict__["close_refcount"] + 1
         return PlgFileObject(self, mode, bufsize)
+
     def close(self):
         if self.__dict__["closed"]:
             return
@@ -76,54 +84,66 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
+
     def sendall(self, data, flags=0):
-        while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in write:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].sendall(data, flags)
-                    except SSL.SysCallError, e:
-                        if e[0] == 32:      # Broken Pipe
-                            self.close()
-                        else:
-                            raise socket.error(e)
-                    except SSL.WantWriteError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
+        """
+        - Use select() to simulate a socket timeout without setting the socket
+            to non-blocking mode.
+        - Don't use pyOpenSSL's sendall() either, since it just loops on WantRead
+            or WantWrite, consuming 100% CPU, and never times out.
+        """
+        timeout = self.__dict__["timeout"]
+        con = self.__dict__["conn"]
+        (read, write, excpt) = select.select([], [con], [], timeout)
+        if not con in write:
+            raise socket.timeout((110, "Operation timed out."))
+
+        starttime = time.time()
+        origlen = len(data)
+        sent = -1
+        while len(data):
+            curtime = time.time()
+            if curtime - starttime > timeout:
+                raise socket.timeout((110, "Operation timed out."))
+
+            try:
+                sent = con.send(data, flags)
+            except SSL.SysCallError, e:
+                if e[0] == 32:      # Broken Pipe
+                    self.close()
+                    sent = 0
+                else:
+                    raise socket.error(e)
+            except (SSL.WantWriteError, SSL.WantReadError):
+                time.sleep(0.2)
+                continue
+
+            data = data[sent:]
+        return origlen - len(data)
+
     def recv(self, bufsize, flags=0):
+        """
+        Use select() to simulate a socket timeout without setting the socket
+        to non-blocking mode
+        """
+        timeout = self.__dict__["timeout"]
+        con = self.__dict__["conn"]
+        (read, write, excpt) = select.select([con], [], [], timeout)
+        if not con in read:
+            raise socket.timeout((110, "Operation timed out."))
+
+        starttime = time.time()
         while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in read:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].recv(bufsize, flags)
-                    except SSL.ZeroReturnError:
-                        return None
-                    except SSL.WantReadError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
+            curtime = time.time()
+            if curtime - starttime > timeout:
+                raise socket.timeout((110, "Operation timed out."))
+
+            try:
+                return con.recv(bufsize, flags)
+            except SSL.ZeroReturnError:
+                return None
+            except SSL.WantReadError:
+                time.sleep(0.2)
         return None
 
 class PlgFileObject(socket._fileobject):



From fedora-extras-commits at redhat.com  Wed Feb 15 17:17:41 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 15 Feb 2006 12:17:41 -0500
Subject: extras-buildsys ChangeLog,1.126.2.34,1.126.2.35
Message-ID: <200602151718.k1FHIBcf012424@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12354

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-02-15  Dan Williams  

    * common/SSLConnection.py
        - Don't use pyOpenSSL's sendall() call, since it simply
            calls SSL_write() in a loop.  Instead, we simulate the sendall
            ourselves, allowing us to honor socket timeouts and to not
            peg the CPU when we get WantReadError/WantWriteError exceptions due
            to non-blocking IO
        - Clean up the recv/sendall functions somewhat too
        - Add some cosmetic inter-function spacing
        - Increase WantReadError/WantWriteError sleeps from 0.1s -> 0.2s
        - Return valid socket error message on timeout




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.34
retrieving revision 1.126.2.35
diff -u -r1.126.2.34 -r1.126.2.35
--- ChangeLog	15 Feb 2006 17:16:18 -0000	1.126.2.34
+++ ChangeLog	15 Feb 2006 17:17:33 -0000	1.126.2.35
@@ -1,5 +1,18 @@
 2006-02-15  Dan Williams  
 
+    * common/SSLConnection.py
+        - Don't use pyOpenSSL's sendall() call, since it simply
+            calls SSL_write() in a loop.  Instead, we simulate the sendall
+            ourselves, allowing us to honor socket timeouts and to not
+            peg the CPU when we get WantReadError/WantWriteError exceptions due
+            to non-blocking IO
+        - Clean up the recv/sendall functions somewhat too
+        - Add some cosmetic inter-function spacing
+        - Increase WantReadError/WantWriteError sleeps from 0.1s -> 0.2s
+        - Return valid socket error message on timeout
+
+2006-02-15  Dan Williams  
+
     * common/XMLRPCServerProxy.py
         - Fix up some of the test code
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:17:47 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 15 Feb 2006 12:17:47 -0500
Subject: rpms/python-numarray/FC-4 python-numarray.spec,1.3,1.4
Message-ID: <200602151718.k1FHIJKP012427@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-numarray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12360

Modified Files:
	python-numarray.spec 
Log Message:
2006 dammit



Index: python-numarray.spec
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/FC-4/python-numarray.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-numarray.spec	15 Feb 2006 17:16:25 -0000	1.3
+++ python-numarray.spec	15 Feb 2006 17:17:47 -0000	1.4
@@ -116,7 +116,7 @@
 
 
 %changelog
-* Wed Feb 15 2005 - Orion Poplawski  - 1.5.1-1
+* Wed Feb 15 2006 - Orion Poplawski  - 1.5.1-1
 - Update to 1.5.1
 
 * Thu Aug 11 2005 - Orion Poplawski  - 1.3.3-4



From fedora-extras-commits at redhat.com  Wed Feb 15 17:52:32 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 15 Feb 2006 12:52:32 -0500
Subject: rpms/atlas/FC-4 atlas.spec,1.4,1.5
Message-ID: <200602151753.k1FHr4r9012763@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/atlas/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12746

Modified Files:
	atlas.spec 
Log Message:
Add --noexecstack to assembly kernels.


Index: atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/atlas/FC-4/atlas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- atlas.spec	10 Oct 2005 21:07:47 -0000	1.4
+++ atlas.spec	15 Feb 2006 17:52:32 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           atlas
 Version:        3.6.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -242,7 +242,7 @@
 
   cat ${BUILD_DATA_DIR}/build.uu | uudecode | zcat - | \
 	sed -e s/g77/gfortran/ -e s/-DAdd__/-DAdd_/ | debian/ab topdir=`pwd` \
-	carch=$BUILD_DIR debug= | bash -x -e
+	carch=$BUILD_DIR fpic="-Wa,--noexecstack" debug= | bash -x -e
   mv lib/$BUILD_DIR/liblapack.a lib/$BUILD_DIR/liblapack_atlas.a
 
   # Create replacement for BLAS and LAPACK Libraries
@@ -289,7 +289,7 @@
 
   cat ${BUILD_DATA_DIR}/build.uu | uudecode | zcat - | \
 	sed -e s/g77/gfortran/ -e s/-DAdd__/-DAdd_/ | debian/ab topdir=`pwd` \
-	carch=$BUILD_DIR fpic="-fPIC" debug= | bash -x -e
+	carch=$BUILD_DIR fpic="-Wa,--noexecstack -fPIC" debug= | bash -x -e
   mv lib/$BUILD_DIR/liblapack.a lib/$BUILD_DIR/liblapack_atlas.a
 
   mkdir tmp
@@ -537,6 +537,10 @@
 %endif
 
 %changelog
+* Mon Oct 10 2005 Quentin Spencer  3.6.0-9
+- Add --noexecstack to compilation of assembly kernels. These were
+  previously marked executable, which caused problems with selinux.
+
 * Mon Oct 10 2005 Quentin Spencer  3.6.0-8
 - Make all devel subpackages depend on their non-devel counterparts.
 - Add /etc/ld.so.conf.d files for -sse and -3dnow, because they don't



From fedora-extras-commits at redhat.com  Wed Feb 15 17:54:35 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 15 Feb 2006 12:54:35 -0500
Subject: rpms/atlas/FC-4 atlas.spec,1.5,1.6
Message-ID: <200602151755.k1FHt8SI012841@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/atlas/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12814

Modified Files:
	atlas.spec 
Log Message:
Wrong date in ChangeLog.


Index: atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/atlas/FC-4/atlas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- atlas.spec	15 Feb 2006 17:52:32 -0000	1.5
+++ atlas.spec	15 Feb 2006 17:54:35 -0000	1.6
@@ -537,7 +537,7 @@
 %endif
 
 %changelog
-* Mon Oct 10 2005 Quentin Spencer  3.6.0-9
+* Wed Feb 15 2006 Quentin Spencer  3.6.0-9
 - Add --noexecstack to compilation of assembly kernels. These were
   previously marked executable, which caused problems with selinux.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:56:46 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 15 Feb 2006 12:56:46 -0500
Subject: rpms/xdaliclock/devel xdaliclock.spec,1.3,1.4
Message-ID: <200602151757.k1FHvIqN012884@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/rpms/xdaliclock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12857

Modified Files:
	xdaliclock.spec 
Log Message:
Fix paths for modular X



Index: xdaliclock.spec
===================================================================
RCS file: /cvs/extras/rpms/xdaliclock/devel/xdaliclock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xdaliclock.spec	15 Feb 2006 17:05:03 -0000	1.3
+++ xdaliclock.spec	15 Feb 2006 17:56:46 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A clock for the X Window System
 Name: xdaliclock
 Version: 2.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Amusements/Graphics
 License: BSD
 URL: http://www.jwz.org/xdaliclock/
@@ -31,15 +31,15 @@
 rm -rf $RPM_BUILD_ROOT
 cd X11
 
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 
-install -p -m 0755 xdaliclock $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install -p -m 0755 xdaliclock $RPM_BUILD_ROOT%{_bindir}
 install -p -m 0755 xdaliclock.man \
-	$RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/xdaliclock.1
+	$RPM_BUILD_ROOT%{_mandir}/man1/xdaliclock.1
 install -p -m 0644 XDaliClock.ad \
-	$RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/XDaliClock
+	$RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XDaliClock
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -54,12 +54,15 @@
 %files
 %defattr(-,root,root)
 %doc README
-%{_prefix}/X11R6/bin/xdaliclock
-%{_prefix}/X11R6/man/man1/xdaliclock.1*
-%{_libdir}/X11/app-defaults/XDaliClock
+%{_bindir}/xdaliclock
+%{_mandir}/man1/xdaliclock.1*
+%{_datadir}/X11/app-defaults/XDaliClock
 %{_datadir}/applications/*
 
 %changelog
+* Wed Feb 15 2006 Chris Ricker  2.23-2
+- Really update for modular X
+
 * Wed Feb 15 2006 Chris Ricker  2.23-1
 - New release
 - Update for modular X



From fedora-extras-commits at redhat.com  Wed Feb 15 17:58:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 15 Feb 2006 12:58:18 -0500
Subject: rpms/perl-Pod-Escapes/devel perl-Pod-Escapes.spec,1.7,1.8
Message-ID: <200602151758.k1FHwos8012950@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Pod-Escapes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12890

Modified Files:
	perl-Pod-Escapes.spec 
Log Message:
Rebuild for FC5 (perl 5.8.8).


Index: perl-Pod-Escapes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Escapes/devel/perl-Pod-Escapes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Pod-Escapes.spec	29 Dec 2005 02:21:06 -0000	1.7
+++ perl-Pod-Escapes.spec	15 Feb 2006 17:58:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Escapes
 Version:        1.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module for resolving POD escape sequences
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module provides things that are useful in decoding Pod E<...>
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Feb 15 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.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 17:58:56 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Wed, 15 Feb 2006 12:58:56 -0500
Subject: rpms/vpnc/devel vpnc.spec,1.10,1.11
Message-ID: <200602151759.k1FHxTJR013041@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12956

Modified Files:
	vpnc.spec 
Log Message:
* Wed Feb 15 2006 Tomas Mraz  0.3.3-6
- rebuild with new gcc



Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vpnc.spec	24 Jan 2006 19:44:10 -0000	1.10
+++ vpnc.spec	15 Feb 2006 17:58:56 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        5
+Release:        6
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -64,6 +64,9 @@
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Wed Feb 15 2006 Tomas Mraz  0.3.3-6
+- rebuild with new gcc
+
 * Tue Jan 24 2006 Tomas Mraz  0.3.3-5
 - send the disconnect packet properly (patch by Laurence Moindrot)
 



From fedora-extras-commits at redhat.com  Wed Feb 15 18:00:57 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 15 Feb 2006 13:00:57 -0500
Subject: rpms/perl-ExtUtils-CBuilder/devel perl-ExtUtils-CBuilder.spec, 1.15,
	1.16
Message-ID: <200602151801.k1FI1VrB014901@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098

Modified Files:
	perl-ExtUtils-CBuilder.spec 
Log Message:
Rebuild for FC5 (perl 5.8.8).


Index: perl-ExtUtils-CBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-ExtUtils-CBuilder.spec	6 Oct 2005 21:53:05 -0000	1.15
+++ perl-ExtUtils-CBuilder.spec	15 Feb 2006 18:00:57 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-CBuilder
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Compile and link C code for Perl modules
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module can build the C portions of Perl modules by invoking the
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Jose Pedro Oliveira  - 0.15-2
+- Rebuild for FC5 (perl 5.8.8).
+
 * Thu Oct  6 2005 Jose Pedro Oliveira  - 0.15-1
 - Update 0.15.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 18:04:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 15 Feb 2006 13:04:28 -0500
Subject: rpms/perl-Config-IniFiles/devel perl-Config-IniFiles.spec,1.5,1.6
Message-ID: <200602151805.k1FI5024015073@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-IniFiles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15056

Modified Files:
	perl-Config-IniFiles.spec 
Log Message:
Rebuild for FC5 (perl 5.8.8).


Index: perl-Config-IniFiles.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-IniFiles/devel/perl-Config-IniFiles.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Config-IniFiles.spec	14 May 2005 02:14:45 -0000	1.5
+++ perl-Config-IniFiles.spec	15 Feb 2006 18:04:28 -0000	1.6
@@ -1,17 +1,17 @@
 Name:           perl-Config-IniFiles
 Version:        2.39
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A module for reading .ini-style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-IniFiles/
-Source0:   http://www.cpan.org/authors/id/W/WA/WADG/Config-IniFiles-2.39.tar.gz
+Source0:        http://www.cpan.org/authors/id/W/WA/WADG/Config-IniFiles-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Config::IniFiles provides a way to have readable configuration files
@@ -38,7 +38,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Jose Pedro Oliveira  - 2.39-4
+- Rebuild for FC5 (perl 5.8.8).
+
 * Sat May 14 2005 Jose Pedro Oliveira  - 2.39-3
 - Add dist tag.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 18:29:38 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 15 Feb 2006 13:29:38 -0500
Subject: fedora-security/audit fc4,1.153,1.154 fc5,1.62,1.63
Message-ID: <200602151829.k1FITcwG015269@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15249

Modified Files:
	fc4 fc5 
Log Message:
Add mozilla issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- fc4	14 Feb 2006 20:34:36 -0000	1.153
+++ fc4	15 Feb 2006 18:29:30 -0000	1.154
@@ -59,6 +59,9 @@
 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2
 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.2
 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050
+CVE-2005-4720 VULNERABLE (mozilla)
+CVE-2005-4720 VULNERABLE (firefox)
+CVE-2005-4720 VULNERABLE (thunderbird)
 CVE-2005-4703 ignore (tomcat) windows only
 CVE-2005-4685 VULNERABLE (mozilla)
 CVE-2005-4685 VULNERABLE (firefox)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- fc5	14 Feb 2006 20:34:36 -0000	1.62
+++ fc5	15 Feb 2006 18:29:30 -0000	1.63
@@ -73,6 +73,9 @@
 CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2006-0019 VULNERABLE (kdelibs, fixed 3.5.1)
 CVE-2005-4703 ignore (tomcat) windows only
+CVE-2005-4720 VULNERABLE (mozilla)
+CVE-2005-4720 version (firefox, fixed 1.5)
+CVE-2005-4720 versoin (thunderbird, fixed 1.5)
 CVE-2005-4685 VULNERABLE (mozilla)
 CVE-2005-4685 VULNERABLE (firefox)
 CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream



From fedora-extras-commits at redhat.com  Wed Feb 15 18:36:18 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 15 Feb 2006 13:36:18 -0500
Subject: fedora-release fedora.repo,1.6,1.7
Message-ID: <200602151836.k1FIaIIY015313@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15295

Modified Files:
	fedora.repo 
Log Message:
add -debuginfo and -source repo definitions.  right now, this is using
baseurl instead of a mirror list since the current mirror list won't be 
sufficient



Index: fedora.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora.repo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora.repo	21 Nov 2005 22:11:57 -0000	1.6
+++ fedora.repo	15 Feb 2006 18:36:10 -0000	1.7
@@ -5,3 +5,19 @@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
+
+[base-debuginfo]
+name=Fedora Core $releasever - $basearch - Base
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/debug/
+#mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
+
+[base-source]
+name=Fedora Core $releasever - $basearch - Base
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/source/SRPMS/
+#mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY



From fedora-extras-commits at redhat.com  Wed Feb 15 18:51:37 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 15 Feb 2006 13:51:37 -0500
Subject: rpms/qgo/devel .cvsignore,1.3,1.4 qgo.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <200602151852.k1FIqAvF015465@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/rpms/qgo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15437

Modified Files:
	.cvsignore qgo.spec sources 
Log Message:
New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jul 2005 01:45:31 -0000	1.3
+++ .cvsignore	15 Feb 2006 18:51:37 -0000	1.4
@@ -1 +1 @@
-qgo-1.0.2.tar.gz
+qgo-1.0.4-r2.tar.gz


Index: qgo.spec
===================================================================
RCS file: /cvs/extras/rpms/qgo/devel/qgo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qgo.spec	6 Jul 2005 01:45:31 -0000	1.7
+++ qgo.spec	15 Feb 2006 18:51:37 -0000	1.8
@@ -1,14 +1,16 @@
 Summary: Graphical Go client and SGF editor
 Name: qgo
-Version: 1.0.2
+Version: 1.0.4r2
 Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://qgo.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.0.4-r2.tar.gz
 Source1: qgo.desktop
-BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel qt-devel
+BuildRequires: libjpeg-devel libpng-devel qt-devel
 BuildRequires: desktop-file-utils
+BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel
+BuildRequires: libXext-devel, libXaw-devel, libXt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -18,11 +20,12 @@
 qGo supports loading MGT and Jago XML format Go games.
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.0.4
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 %configure
+ln -s normaltools_gui.h src/normaltools.h
 make %{?_smp_mflags}
 
 cp -p %{SOURCE1} templates/qgo.desktop
@@ -55,6 +58,10 @@
 %{_datadir}/mimelnk/text/sgf.desktop
 
 %changelog
+* Wed Feb 15 2006 Chris Ricker  1.0.4r2
+- New upstream release
+- Update for modular X
+
 * Tue Jul 05 2005 Chris Ricker  1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jul 2005 01:45:31 -0000	1.3
+++ sources	15 Feb 2006 18:51:37 -0000	1.4
@@ -1 +1 @@
-c202a232d1902a902683c421f0177b8c  qgo-1.0.2.tar.gz
+49da743ca769d8d18fc3a4b7a6aa0bf8  qgo-1.0.4-r2.tar.gz



From fedora-extras-commits at redhat.com  Wed Feb 15 19:04:42 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 15 Feb 2006 14:04:42 -0500
Subject: fedora-release fedora-release.spec,1.16,1.17
Message-ID: <200602151904.k1FJ4gBF017481@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17452

Modified Files:
	fedora-release.spec 
Log Message:
bump version

*docs*
note that the debuginfo is no longer part of the base repo.  you need to
enable the base-debuginfo repo to get debuginfo packages.  similarly, there
is now a base-source repo with srpms



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fedora-release.spec	11 Jan 2006 18:57:33 -0000	1.16
+++ fedora-release.spec	15 Feb 2006 19:04:31 -0000	1.17
@@ -1,4 +1,4 @@
-%define release_version 4.91
+%define release_version 4.92
 %define release_name Pre-FC5
 %define builtin_release_version Rawhide
 %define builtin_release_name Rawhide



From fedora-extras-commits at redhat.com  Wed Feb 15 19:16:37 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Feb 2006 14:16:37 -0500
Subject: rpms/ez-ipupdate/devel .cvsignore, 1.3, 1.4 ez-ipupdate.spec, 1.7, 
	1.8 sources, 1.3, 1.4
Message-ID: <200602151917.k1FJH916018365@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ez-ipupdate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18320

Modified Files:
	.cvsignore ez-ipupdate.spec sources 
Log Message:
* Wed Feb 15 2006 Ville Skytt??  - 3.0.11-0.9.b8
- Sync with Debian's 3.0.11b8-10.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2004 11:21:02 -0000	1.3
+++ .cvsignore	15 Feb 2006 19:16:36 -0000	1.4
@@ -1,3 +1,2 @@
 ez-ipupdate-3.0.11b8.tar.gz
-ez-ipupdate_3.0.11b8-6.diff.gz
-ez-ipupdate_3.0.11b8-8.diff.gz
+ez-ipupdate_3.0.11b8-10.diff.gz


Index: ez-ipupdate.spec
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ez-ipupdate.spec	6 Apr 2005 22:11:37 -0000	1.7
+++ ez-ipupdate.spec	15 Feb 2006 19:16:36 -0000	1.8
@@ -1,7 +1,6 @@
 Name:           ez-ipupdate
 Version:        3.0.11
-Release:        0.8.b8
-
+Release:        0.9.b8%{?dist}
 Summary:        Client for Dynamic DNS Services
 
 Group:          Applications/Internet
@@ -9,7 +8,7 @@
 URL:            http://www.gusnet.cx/proj/ez-ipupdate/
 Source0:        http://www.gusnet.cx/proj/ez-ipupdate/dist/ez-ipupdate-3.0.11b8.tar.gz
 Source1:        %{name}.init
-Patch0:         http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-8.diff.gz
+Patch0:         http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-10.diff.gz
 Patch1:         %{name}-pidfile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,14 +111,17 @@
 %attr(0755,root,root) %{_sbindir}/ez-ipupdate
 %attr(0755,root,root) %{_initrddir}/ez-ipupdate
 %defattr(0644,ez-ipupd,ez-ipupd,0755)
-%dir %{_localstatedir}/cache/ez-ipupdate
+%dir %{_localstatedir}/cache/ez-ipupdate/
 %ghost %{_localstatedir}/cache/ez-ipupdate/default-cache
-%dir %{_localstatedir}/run/ez-ipupdate
+%dir %{_localstatedir}/run/ez-ipupdate/
 %ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate.conf
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Wed Feb 15 2006 Ville Skytt??  - 3.0.11-0.9.b8
+- Sync with Debian's 3.0.11b8-10.
+
+* Fri Apr  7 2005 Michael Schwendt  - 3.0.11-0.8.b8
 - rebuilt
 
 * Sun Nov 14 2004 Ville Skytt??  - 0:3.0.11-0.7.b8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2004 11:21:02 -0000	1.3
+++ sources	15 Feb 2006 19:16:36 -0000	1.4
@@ -1,2 +1,2 @@
 000211add4c4845ffa4211841bff4fb0  ez-ipupdate-3.0.11b8.tar.gz
-2d3fd3d0599667244931444c69394c51  ez-ipupdate_3.0.11b8-8.diff.gz
+e400c9c8d594922e394806b717250c35  ez-ipupdate_3.0.11b8-10.diff.gz



From fedora-extras-commits at redhat.com  Wed Feb 15 19:21:24 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 15 Feb 2006 14:21:24 -0500
Subject: rpms/python-dateutil/devel python-dateutil.spec,1.2,1.3
Message-ID: <200602151921.k1FJLviE018468@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-dateutil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18442

Modified Files:
	python-dateutil.spec 
Log Message:
Rebuild



Index: python-dateutil.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dateutil/devel/python-dateutil.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-dateutil.spec	23 Dec 2005 00:03:51 -0000	1.2
+++ python-dateutil.spec	15 Feb 2006 19:21:24 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-dateutil
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Powerful extensions to the standard datetime module
 
 Group:          Development/Languages
@@ -41,6 +41,9 @@
 %{python_sitelib}/dateutil/
 
 %changelog
+* Wed Feb 15 2006 Orion Poplawski  1.1-2
+- Rebuild for gcc/glibc changes
+
 * Thu Dec 22 2005 Orion Poplawski  1.1-1
 - Update to 1.1
 



From fedora-extras-commits at redhat.com  Wed Feb 15 19:23:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Feb 2006 14:23:17 -0500
Subject: rpms/cvsps/devel cvsps.spec,1.3,1.4
Message-ID: <200602151923.k1FJNnJp018544@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cvsps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18522

Modified Files:
	cvsps.spec 
Log Message:
* Wed Feb 15 2006 Ville Skytt??  - 2.1-3
- Rebuild.



Index: cvsps.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsps/devel/cvsps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cvsps.spec	27 May 2005 06:26:34 -0000	1.3
+++ cvsps.spec	15 Feb 2006 19:23:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           cvsps
 Version:        2.1
-Release:        2
+Release:        3%{?dist}
 Summary:        Patchset tool for CVS
 
 Group:          Development/Tools
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skytt??  - 2.1-3
+- Rebuild.
+
 * Fri May 27 2005 Ville Skytt??  - 2.1-2
 - 2.1.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 19:28:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Feb 2006 14:28:01 -0500
Subject: rpms/cabextract/devel cabextract.spec,1.8,1.9
Message-ID: <200602151928.k1FJSYPB018757@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cabextract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18736

Modified Files:
	cabextract.spec 
Log Message:
* Wed Feb 15 2006 Ville Skytt??  - 1.1-4
- Rebuild.



Index: cabextract.spec
===================================================================
RCS file: /cvs/extras/rpms/cabextract/devel/cabextract.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cabextract.spec	18 Mar 2005 19:17:01 -0000	1.8
+++ cabextract.spec	15 Feb 2006 19:28:01 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           cabextract
 Version:        1.1
-Release:        3
+Release:        4%{?dist}
 Summary:        Utility for extracting cabinet (.cab) archives
 
 Group:          Applications/Archiving
 License:        GPL
 URL:            http://www.kyz.uklinux.net/cabextract.php
-Source:         http://www.kyz.uklinux.net/downloads/cabextract-%{version}.tar.gz
+Source:         http://www.kyz.uklinux.net/downloads/%{name}-%{version}.tar.gz
 Patch0:         %{name}-macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,6 +17,7 @@
 
 %prep
 %setup -q
+chmod -x mspack/mspack.h
 %patch0 -p1
 
 
@@ -42,6 +43,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skytt??  - 1.1-4
+- Rebuild.
+
 * Fri Mar 18 2005 Ville Skytt??  - 1.1-3
 - Fix FC4 build.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 19:30:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Feb 2006 14:30:41 -0500
Subject: rpms/freedroid/devel freedroid.spec,1.6,1.7
Message-ID: <200602151931.k1FJVDkB018862@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/freedroid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18830

Modified Files:
	freedroid.spec 
Log Message:
* Wed Feb 15 2006 Ville Skytt??  - 1.0.2-4
- Rebuild, cosmetics.



Index: freedroid.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroid/devel/freedroid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freedroid.spec	6 Apr 2005 22:11:37 -0000	1.6
+++ freedroid.spec	15 Feb 2006 19:30:40 -0000	1.7
@@ -1,19 +1,23 @@
 Name:           freedroid
 Version:        1.0.2
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Clone of the C64 game Paradroid
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://freedroid.sourceforge.net/
-Source0:        http://dl.sf.net/freedroid/freedroid-1.0.2.tar.gz
+Source0:        http://download.sf.net/freedroid/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Patch0:         %{name}-cleaninst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL_image-devel, SDL_mixer-devel, libjpeg-devel, libpng-devel
-BuildRequires:  ImageMagick, libvorbis-devel, desktop-file-utils
+BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_mixer-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  ImageMagick
+BuildRequires:  libvorbis-devel
+BuildRequires:  desktop-file-utils
 
 %description
 This is a clone of the classic game "Paradroid" on Commodore 64
@@ -65,7 +69,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Wed Feb 15 2006 Ville Skytt??  - 1.0.2-4
+- Rebuild, cosmetics.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.0.2-3
 - rebuilt
 
 * Sat Nov 22 2003 Ville Skytt??  - 0:1.0.2-0.fdr.2



From fedora-extras-commits at redhat.com  Wed Feb 15 19:39:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 15 Feb 2006 14:39:09 -0500
Subject: rpms/perl-Pod-Simple/devel perl-Pod-Simple.spec,1.8,1.9
Message-ID: <200602151939.k1FJdfgI019095@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Pod-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19078

Modified Files:
	perl-Pod-Simple.spec 
Log Message:
Rebuild for FC5 (perl 5.8.8).


Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/perl-Pod-Simple.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Pod-Simple.spec	23 Jan 2006 17:12:59 -0000	1.8
+++ perl-Pod-Simple.spec	15 Feb 2006 19:39:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Pod-Simple
 Version:        3.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Jose Pedro Oliveira  - 3.04-2
+- Rebuild for FC5 (perl 5.8.8).
+
 * Thu Jan 19 2006 Jose Pedro Oliveira  - 3.04-1
 - Update to 3.04.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 19:40:17 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 15 Feb 2006 14:40:17 -0500
Subject: rpms/revelation/devel revelation.spec,1.16,1.17
Message-ID: <200602151940.k1FJenEN019126@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/revelation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19109

Modified Files:
	revelation.spec 
Log Message:
BR gnome-python2-desktop now needed


Index: revelation.spec
===================================================================
RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- revelation.spec	13 Feb 2006 17:32:14 -0000	1.16
+++ revelation.spec	15 Feb 2006 19:40:16 -0000	1.17
@@ -4,7 +4,7 @@
 Summary:	Password manager for GNOME 2
 Name:		revelation
 Version:	0.4.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Source0:	ftp://oss.codepoet.no/revelation/revelation-0.4.7.tar.bz2
@@ -26,7 +26,7 @@
 BuildRequires:	python-crypto >= 2.0
 BuildRequires:	cracklib
 BuildRequires:	cracklib-dicts
-BuildRequires:	gnome-panel-devel gnome-python2-extras
+BuildRequires:	gnome-panel-devel gnome-python2-extras gnome-python2-desktop
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n)
 Requires(post):         GConf2 shared-mime-info desktop-file-utils
 Requires(preun):        GConf2
@@ -106,6 +106,9 @@
 %{_libexecdir}/revelation-applet
 
 %changelog
+* Mon Feb 15 2006 Thorsten Leemhuis   0.4.7-3
+- BR gnome-python2-desktop now needed
+
 * Mon Feb 13 2006 Thorsten Leemhuis 
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Wed Feb 15 19:41:09 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Wed, 15 Feb 2006 14:41:09 -0500
Subject: rpms/moodss/devel moodss.spec,1.19,1.20
Message-ID: <200602151941.k1FJfgXk019192@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19164

Modified Files:
	moodss.spec 
Log Message:
rebuild for Fedora Extras 5



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- moodss.spec	22 Jan 2006 16:40:59 -0000	1.19
+++ moodss.spec	15 Feb 2006 19:41:09 -0000	1.20
@@ -1,6 +1,6 @@
 Name: moodss
 Version: 21.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
@@ -58,6 +58,9 @@
 
 %changelog
 
+* Wed Feb 15 2006 Jean-Luc Fontaine  21.0-2
+- rebuild for Fedora Extras 5
+
 * Fri Nov 11 2005 Jean-Luc Fontaine  21.0-1
 - 21.0 upstream release
 - added R dependency



From fedora-extras-commits at redhat.com  Wed Feb 15 19:44:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 15 Feb 2006 14:44:09 -0500
Subject: rpms/perl-ExtUtils-Depends/devel perl-ExtUtils-Depends.spec, 1.8,
	1.9
Message-ID: <200602151944.k1FJifLg019341@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-Depends/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19309

Modified Files:
	perl-ExtUtils-Depends.spec 
Log Message:
Rebuild for FC5 (perl 5.8.8).


Index: perl-ExtUtils-Depends.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-Depends/devel/perl-ExtUtils-Depends.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-ExtUtils-Depends.spec	29 Dec 2005 00:23:37 -0000	1.8
+++ perl-ExtUtils-Depends.spec	15 Feb 2006 19:44:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-Depends
 Version:        0.205
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Easily build XS extensions that depend on XS extensions
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module tries to make it easy to build Perl extensions that use
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Jose Pedro Oliveira  - 0.205-4
+- Rebuild for FC5 (perl 5.8.8).
+
 * Thu Dec 29 2005 Jose Pedro Oliveira  - 0.205-3
 - Dist tag.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 19:44:36 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Wed, 15 Feb 2006 14:44:36 -0500
Subject: rpms/moomps/devel moomps.spec,1.8,1.9
Message-ID: <200602151945.k1FJj9I3019354@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19329

Modified Files:
	moomps.spec 
Log Message:
rebuild for Fedora Extras 5



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moomps.spec	22 Jan 2006 16:44:49 -0000	1.8
+++ moomps.spec	15 Feb 2006 19:44:36 -0000	1.9
@@ -1,6 +1,6 @@
 Name: moomps
 Version: 5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
@@ -78,6 +78,9 @@
 
 %changelog
 
+* Wed Feb 15 2006 Jean-Luc Fontaine  5.4-2
+- rebuild for Fedora Extras 5
+
 * Fri Nov 11 2005 Jean-Luc Fontaine  5.4-1
 - 5.4 upstream release
 



From fedora-extras-commits at redhat.com  Wed Feb 15 19:48:48 2006
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed, 15 Feb 2006 14:48:48 -0500
Subject: fedora-release/img header-fedora_logo01.png,NONE,1.1
Message-ID: <200602151948.k1FJmmhI019473@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/fedora-release/img
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19456

Added Files:
	header-fedora_logo01.png 
Log Message:
New logo, baby.  Let's get that in test3.



From fedora-extras-commits at redhat.com  Wed Feb 15 19:51:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 15 Feb 2006 14:51:44 -0500
Subject: rpms/perl-ExtUtils-ParseXS/devel perl-ExtUtils-ParseXS.spec, 1.12, 
	1.13
Message-ID: <200602151952.k1FJqGd2019511@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19494

Modified Files:
	perl-ExtUtils-ParseXS.spec 
Log Message:
Rebuild for FC5 (perl 5.8.8).


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-ExtUtils-ParseXS.spec	11 Oct 2005 17:46:40 -0000	1.12
+++ perl-ExtUtils-ParseXS.spec	15 Feb 2006 19:51:44 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-ExtUtils-ParseXS
 Version:        2.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Module and a script for converting Perl XS code into C code
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(ExtUtils::CBuilder)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 ExtUtils::ParseXS will compile XS code into C code by embedding the
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Jose Pedro Oliveira  - 2.15-2
+- Rebuild for FC5 (perl 5.8.8).
+
 * Tue Oct 11 2005 Jose Pedro Oliveira  - 2.15-1
 - Update to 2.15.
 



From fedora-extras-commits at redhat.com  Wed Feb 15 19:58:18 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 15 Feb 2006 14:58:18 -0500
Subject: fedora-release fedora-core.repo, NONE, 1.1 fedora-devel.repo, 1.7,
	1.8 fedora-extras-devel.repo, 1.8, 1.9 fedora-extras.repo, 1.2,
	1.3 fedora-updates-testing.repo, 1.3, 1.4 fedora-updates.repo,
	1.5, 1.6 fedora.repo, 1.7, NONE
Message-ID: <200602151958.k1FJwIgc019607@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19579

Modified Files:
	fedora-devel.repo fedora-extras-devel.repo fedora-extras.repo 
	fedora-updates-testing.repo fedora-updates.repo 
Added Files:
	fedora-core.repo 
Removed Files:
	fedora.repo 
Log Message:
Uniformity is good. Let's try that for a change.

Changes
-------
rename fedora.repo -> fedora-core.repo
Add source and debuginfo repos. These exist for extras now, and will
exist by FC5.

s/released updates/updates/

For repo file fedora-XXX.repo, repos are named XXX, XXX-debuginfo, and
XXX-source. Clean up names displayed as well.

Will move fedora-devel -> fedora-development, and
fedora-extras-devel -> fedora-extras-development shortly.




--- NEW FILE fedora-core.repo ---
[core]
name=Fedora Core $releasever - $basearch
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY

[core-debuginfo]
name=Fedora Core $releasever - $basearch - Debug
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/debug/
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY

[core-source]
name=Fedora Core $releasever - Source
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/source/SRPMS/
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY


Index: fedora-devel.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-devel.repo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-devel.repo	21 Nov 2005 22:11:57 -0000	1.7
+++ fedora-devel.repo	15 Feb 2006 19:58:10 -0000	1.8
@@ -1,9 +1,8 @@
-[development]
 # These packages are untested and still under development. This
 # repository is used for updates to test releases, and for
 # development of new releases.
 #
-# This repository can see significant daily turn over and can see major
+# This repository can see significant daily turnover and major
 # functionality changes which cause unexpected problems with other
 # development packages. Please use these packages if you want to work
 # with the Fedora developers by testing these new development packages.
@@ -16,11 +15,26 @@
 # testing and troubleshooting for development packages in conjunction
 # with developing new releases.
 #
-# Reportable issues should be filed at bugzilla.redhat.com
+# Reproducible and reportable issues should be filed at http://bugzilla.redhat.com/
 # Product: Fedora Core
 # Version: devel
-name=Fedora Core $releasever - Development Tree
+
+[development]
+name=Fedora Core - Development
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
 enabled=1
 gpgcheck=0
+
+[development-debuginfo]
+name=Fedora Core - Development - Debug
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/debug/
+enabled=0
+gpgcheck=0
+
+[development-source]
+name=Fedora Core - Development - Source
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/
+enabled=0
+gpgcheck=0
+


Index: fedora-extras-devel.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-devel.repo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-extras-devel.repo	21 Nov 2005 02:59:35 -0000	1.8
+++ fedora-extras-devel.repo	15 Feb 2006 19:58:10 -0000	1.9
@@ -1,7 +1,21 @@
 [extras-development]
-name=Fedora Extras $releasever - Development Tree
+name=Fedora Extras - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
+
+[extras-development-debuginfo]
+name=Fedora Extras - Development - Debug
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/debug/
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
+gpgcheck=1
+
+[extras-development-source]
+name=Fedora Extras - Development - Source
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/SRPMS/
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
+gpgcheck=1


Index: fedora-extras.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-extras.repo	21 Nov 2005 02:59:35 -0000	1.2
+++ fedora-extras.repo	15 Feb 2006 19:58:10 -0000	1.3
@@ -5,3 +5,17 @@
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1
+
+[extras-debuginfo]
+name=Fedora Extras $releasever - $basearch - Debug
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/debug/
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
+gpgcheck=1
+
+[extras-source]
+name=Fedora Extras $releasever - Source
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/SRPMS/
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
+gpgcheck=1


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-updates-testing.repo	25 May 2005 09:05:53 -0000	1.3
+++ fedora-updates-testing.repo	15 Feb 2006 19:58:10 -0000	1.4
@@ -5,3 +5,17 @@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-debuginfo]
+name=Fedora Core $releasever - $basearch - Test Updates Debug
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/debug/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+
+[updates-testing-source]
+name=Fedora Core $releasever - Test Updates Source
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-updates.repo	21 Nov 2005 02:59:35 -0000	1.5
+++ fedora-updates.repo	15 Feb 2006 19:58:10 -0000	1.6
@@ -1,7 +1,21 @@
-[updates-released]
-name=Fedora Core $releasever - $basearch - Released Updates
+[updates]
+name=Fedora Core $releasever - $basearch - Updates
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/
 mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc$releasever
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-debuginfo]
+name=Fedora Core $releasever - $basearch - Updates - Debug
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/debug/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+
+[updates-source]
+name=Fedora Core $releasever - Updates Source
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/SRPMS/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora


--- fedora.repo DELETED ---



From fedora-extras-commits at redhat.com  Wed Feb 15 20:02:09 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Wed, 15 Feb 2006 15:02:09 -0500
Subject: fedora-release fedora-development.repo, NONE,
	1.1 fedora-extras-development.repo, NONE,
	1.1 fedora-devel.repo, 1.8, NONE fedora-extras-devel.repo, 1.9, NONE
Message-ID: <200602152002.k1FK29no021445@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21424

Added Files:
	fedora-development.repo fedora-extras-development.repo 
Removed Files:
	fedora-devel.repo fedora-extras-devel.repo 
Log Message:
rename -devel -> -development



--- NEW FILE fedora-development.repo ---
# These packages are untested and still under development. This
# repository is used for updates to test releases, and for
# development of new releases.
#
# This repository can see significant daily turnover and major
# functionality changes which cause unexpected problems with other
# development packages. Please use these packages if you want to work
# with the Fedora developers by testing these new development packages.
#
# fedora-test-list at redhat.com is available as a discussion forum for
# testing and troubleshooting for development packages in conjunction
# with new test releases.
#
# fedora-devel-list at redhat.com is available as a discussion forum for
# testing and troubleshooting for development packages in conjunction
# with developing new releases.
#
# Reproducible and reportable issues should be filed at http://bugzilla.redhat.com/
# Product: Fedora Core
# Version: devel

[development]
name=Fedora Core - Development
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
enabled=1
gpgcheck=0

[development-debuginfo]
name=Fedora Core - Development - Debug
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/debug/
enabled=0
gpgcheck=0

[development-source]
name=Fedora Core - Development - Source
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/
enabled=0
gpgcheck=0



--- NEW FILE fedora-extras-development.repo ---
[extras-development]
name=Fedora Extras - Development Tree
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
gpgcheck=1

[extras-development-debuginfo]
name=Fedora Extras - Development - Debug
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/debug/
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
gpgcheck=1

[extras-development-source]
name=Fedora Extras - Development - Source
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/SRPMS/
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
gpgcheck=1


--- fedora-devel.repo DELETED ---


--- fedora-extras-devel.repo DELETED ---



From fedora-extras-commits at redhat.com  Wed Feb 15 20:09:57 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 15 Feb 2006 15:09:57 -0500
Subject: rpms/obby/devel obby.spec,1.13,1.14
Message-ID: <200602152010.k1FKAVRc021505@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21488

Modified Files:
	obby.spec 
Log Message:
rebuild


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- obby.spec	10 Jan 2006 07:27:15 -0000	1.13
+++ obby.spec	15 Feb 2006 20:09:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           obby
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Luke Macken  - 0.3.0-3
+- Rebuild for FE5
+
 * Tue Jan 10 2006 Luke Macken  - 0.3.0-2
 - Remove libsigc++ from BuildRequires
 



From fedora-extras-commits at redhat.com  Wed Feb 15 20:12:29 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 15 Feb 2006 15:12:29 -0500
Subject: rpms/valknut/devel valknut.spec,1.3,1.4
Message-ID: <200602152013.k1FKD3iZ021567@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/valknut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21550

Modified Files:
	valknut.spec 
Log Message:
rebuild


Index: valknut.spec
===================================================================
RCS file: /cvs/extras/rpms/valknut/devel/valknut.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- valknut.spec	10 Nov 2005 04:24:22 -0000	1.3
+++ valknut.spec	15 Feb 2006 20:12:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           valknut
 Version:        0.3.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Valknut is a QT Direct Connect client
 
 Group:          Applications/Internet
@@ -56,6 +56,9 @@
 
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Wed Feb 15 20:18:28 2006
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed, 15 Feb 2006 15:18:28 -0500
Subject: fedora-release indexhtml-foot,1.1,1.2 indexhtml-head,1.1,1.2
Message-ID: <200602152018.k1FKISSR021775@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21755

Modified Files:
	indexhtml-foot indexhtml-head 
Log Message:
Resolves bug #178573, updating the links to the new f.r.c structure, calling the new logo, and now highlighting FedoraProject.org and FedoraForum.org.  Fanfuckingtastic.


Index: indexhtml-foot
===================================================================
RCS file: /cvs/fedora/fedora-release/indexhtml-foot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indexhtml-foot	1 Jun 2005 19:18:12 -0000	1.1
+++ indexhtml-foot	15 Feb 2006 20:18:20 -0000	1.2
@@ -7,7 +7,7 @@