scm-commits March 2007

scm-commits@lists.fedoraproject.org

1 participants
3927 discussions

rpms/facter/FC-6 .cvsignore, 1.4, 1.5 facter.spec, 1.5, 1.6 sources, 1.4, 1.5
by fedora-extras-commits＠redhat.com 31 Mar '07

31 Mar '07

Author: lutter Update of /cvs/extras/rpms/facter/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4575 Modified Files: .cvsignore facter.spec sources Log Message: New version 1.3.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/facter/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jan 2007 23:04:27 -0000 1.4 +++ .cvsignore 31 Mar 2007 01:02:59 -0000 1.5 @@ -1 +1 @@ -facter-1.3.6.tgz +facter-1.3.7.tgz Index: facter.spec =================================================================== RCS file: /cvs/extras/rpms/facter/FC-6/facter.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- facter.spec 19 Jan 2007 23:04:27 -0000 1.5 +++ facter.spec 31 Mar 2007 01:02:59 -0000 1.6 @@ -5,7 +5,7 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.3.6 +Version: 1.3.7 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -60,6 +60,9 @@ %changelog +* Thu Mar 29 2007 David Lutterkort <dlutter(a)redhat.com> - 1.3.7-1 +- New version + * Fri Jan 19 2007 David Lutterkort <dlutter(a)redhat.com> - 1.3.6-1 - New version Index: sources =================================================================== RCS file: /cvs/extras/rpms/facter/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jan 2007 23:04:27 -0000 1.4 +++ sources 31 Mar 2007 01:02:59 -0000 1.5 @@ -1 +1 @@ -35cd0a16d7500061b5fe2f3615d1f677 facter-1.3.6.tgz +60c26f7ab0cf1658f41547d19a910c42 facter-1.3.7.tgz

1 0

rpms/facter/devel .cvsignore, 1.4, 1.5 facter.spec, 1.5, 1.6 sources, 1.4, 1.5
by fedora-extras-commits＠redhat.com 31 Mar '07

31 Mar '07

Author: lutter Update of /cvs/extras/rpms/facter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4500 Modified Files: .cvsignore facter.spec sources Log Message: New version 1.3.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Jan 2007 23:02:52 -0000 1.4 +++ .cvsignore 31 Mar 2007 01:01:49 -0000 1.5 @@ -1 +1 @@ -facter-1.3.6.tgz +facter-1.3.7.tgz Index: facter.spec =================================================================== RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- facter.spec 19 Jan 2007 23:02:52 -0000 1.5 +++ facter.spec 31 Mar 2007 01:01:49 -0000 1.6 @@ -5,7 +5,7 @@ Summary: Ruby module for collecting simple facts about a host operating system Name: facter -Version: 1.3.6 +Version: 1.3.7 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -60,6 +60,9 @@ %changelog +* Thu Mar 29 2007 David Lutterkort <dlutter(a)redhat.com> - 1.3.7-1 +- New version + * Fri Jan 19 2007 David Lutterkort <dlutter(a)redhat.com> - 1.3.6-1 - New version Index: sources =================================================================== RCS file: /cvs/extras/rpms/facter/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Jan 2007 23:02:52 -0000 1.4 +++ sources 31 Mar 2007 01:01:49 -0000 1.5 @@ -1 +1 @@ -35cd0a16d7500061b5fe2f3615d1f677 facter-1.3.6.tgz +60c26f7ab0cf1658f41547d19a910c42 facter-1.3.7.tgz

1 0

rpms/libmtp/FC-5 .cvsignore, 1.5, 1.6 libmtp.spec, 1.4, 1.5 sources, 1.5, 1.6
by fedora-extras-commits＠redhat.com 30 Mar '07

30 Mar '07

Author: snirkel Update of /cvs/extras/rpms/libmtp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22390 Modified Files: .cvsignore libmtp.spec sources Log Message: Works fine in devel, backporting to FC-5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Mar 2007 21:23:54 -0000 1.5 +++ .cvsignore 30 Mar 2007 22:09:59 -0000 1.6 @@ -1 +1 @@ -libmtp-0.1.4.tar.gz +libmtp-0.1.5.tar.gz Index: libmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-5/libmtp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libmtp.spec 10 Mar 2007 21:23:54 -0000 1.4 +++ libmtp.spec 30 Mar 2007 22:09:59 -0000 1.5 @@ -11,7 +11,7 @@ # Name: libmtp -Version: 0.1.4 +Version: 0.1.5 Release: 1%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ @@ -105,6 +105,11 @@ %changelog +* Mon Mar 26 2007 Linus Walleij <triad(a)df.lth.se> 0.1.5-1 +- New upstream release. +- Candidate for FC5, FC6 backport. +- Hopefully API/ABI compatible, testing in devel tree. + * Wed Mar 7 2007 Linus Walleij <triad(a)df.lth.se> 0.1.4-1 - New upstream release. - Candidate for FC5, FC6 backport. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Mar 2007 21:23:54 -0000 1.5 +++ sources 30 Mar 2007 22:09:59 -0000 1.6 @@ -1 +1 @@ -e253a1cb99521d8b1b217d249bc3107c libmtp-0.1.4.tar.gz +597b62d994d9491531b9e67190f6cfe7 libmtp-0.1.5.tar.gz

1 0

rpms/libmtp/FC-6 .cvsignore, 1.5, 1.6 libmtp.spec, 1.4, 1.5 sources, 1.5, 1.6
by fedora-extras-commits＠redhat.com 30 Mar '07

30 Mar '07

Author: snirkel Update of /cvs/extras/rpms/libmtp/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22307 Modified Files: .cvsignore libmtp.spec sources Log Message: Works fine in devel, backport to FC-6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Mar 2007 21:21:45 -0000 1.5 +++ .cvsignore 30 Mar 2007 22:08:00 -0000 1.6 @@ -1 +1 @@ -libmtp-0.1.4.tar.gz +libmtp-0.1.5.tar.gz Index: libmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-6/libmtp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libmtp.spec 10 Mar 2007 21:21:45 -0000 1.4 +++ libmtp.spec 30 Mar 2007 22:08:00 -0000 1.5 @@ -11,7 +11,7 @@ # Name: libmtp -Version: 0.1.4 +Version: 0.1.5 Release: 1%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ @@ -105,6 +105,11 @@ %changelog +* Mon Mar 26 2007 Linus Walleij <triad(a)df.lth.se> 0.1.5-1 +- New upstream release. +- Candidate for FC5, FC6 backport. +- Hopefully API/ABI compatible, testing in devel tree. + * Wed Mar 7 2007 Linus Walleij <triad(a)df.lth.se> 0.1.4-1 - New upstream release. - Candidate for FC5, FC6 backport. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmtp/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Mar 2007 21:21:45 -0000 1.5 +++ sources 30 Mar 2007 22:08:00 -0000 1.6 @@ -1 +1 @@ -e253a1cb99521d8b1b217d249bc3107c libmtp-0.1.4.tar.gz +597b62d994d9491531b9e67190f6cfe7 libmtp-0.1.5.tar.gz

1 0

rpms/cvs2cl/FC-6 cvs2cl-2.60-perldeps.patch, NONE, 1.1 cvs2cl.spec, 1.11, 1.12 sources, 1.2, 1.3
by fedora-extras-commits＠redhat.com 30 Mar '07

30 Mar '07

Author: scop Update of /cvs/extras/rpms/cvs2cl/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18035 Modified Files: cvs2cl.spec sources Added Files: cvs2cl-2.60-perldeps.patch Log Message: * Sat Mar 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.60-1 - 2.60. - Dependency fixups. * Fri Dec 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.59-5 - Eliminate unnecessary file based dependencies. cvs2cl-2.60-perldeps.patch: --- NEW FILE cvs2cl-2.60-perldeps.patch --- Use straightforward /usr/bin/perl shebang so rpmbuild catches it and autogenerates better dependencies. --- cvs2cl~ 2007-02-04 22:22:11.000000000 +0200 +++ cvs2cl 2007-03-31 00:37:30.000000000 +0300 @@ -1,7 +1,4 @@ -#!/bin/sh -exec perl -w -x $0 ${1+"$@"} # -*- mode: perl; perl-indent-level: 2; -*- -#!perl -w - +#!/usr/bin/perl -w ############################################################## ### ### Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-6/cvs2cl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cvs2cl.spec 15 Sep 2006 15:17:36 -0000 1.11 +++ cvs2cl.spec 30 Mar 2007 21:48:02 -0000 1.12 @@ -1,6 +1,6 @@ Name: cvs2cl -Version: 2.59 -Release: 4%{?dist} +Version: 2.60 +Release: 1%{?dist} Summary: Generate ChangeLogs from CVS working copies Group: Development/Tools @@ -15,12 +15,12 @@ Source6: http://www.red-bean.com/cvs2cl/cvs2cl_ruether.xslt Source7: http://www.red-bean.com/cvs2cl/cl2html_rss-karaguezian.xslt Source8: http://www.red-bean.com/cvs2cl/ChangeLog.xsd +Patch0: %{name}-2.60-perldeps.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: %{_bindir}/pod2man -Requires: perl -Requires: %{_datadir}/xml +Requires: xml-common %description cvs2cl generates GNU-style ChangeLogs for a CVS working copy using @@ -31,6 +31,7 @@ %prep %setup -c -T sed -e 's/cvs2cl\.pl/cvs2cl/' %{SOURCE0} > cvs2cl +%patch0 %build @@ -70,6 +71,13 @@ %changelog +* Sat Mar 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.60-1 +- 2.60. +- Dependency fixups. + +* Fri Dec 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.59-5 +- Eliminate unnecessary file based dependencies. + * Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.59-4 - Add XSD from Yury Lebedev. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2006 15:17:36 -0000 1.2 +++ sources 30 Mar 2007 21:48:02 -0000 1.3 @@ -4,6 +4,6 @@ f5af372c18e9199955d87f9da009b697 cl2html-ciaglia.xslt 1b6c38d10a73eb1667550d2b56bcf3b9 cl2html_rss-karaguezian.xslt de54d6ce72570c845ef5a0dcc8bf9399 cl2html.xslt -2267d1023719f72358d2739e41ca984c cvs2cl.pl +30b45da870831c764473e63e5dfd8fe5 cvs2cl.pl f7d7cf88b314c0cb1a16c8c93d1c8e54 cvs2cl_ruether.xslt 6c521f9e2b2ae5fbcee63b3c2f47d607 filter-cvs2cl.xslt

1 0

rpms/cvs2cl/devel cvs2cl-2.60-perldeps.patch, NONE, 1.1 cvs2cl.spec, 1.12, 1.13 sources, 1.2, 1.3
by fedora-extras-commits＠redhat.com 30 Mar '07

30 Mar '07

Author: scop Update of /cvs/extras/rpms/cvs2cl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17952 Modified Files: cvs2cl.spec sources Added Files: cvs2cl-2.60-perldeps.patch Log Message: * Sat Mar 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.60-1 - 2.60. - Dependency fixups. cvs2cl-2.60-perldeps.patch: --- NEW FILE cvs2cl-2.60-perldeps.patch --- Use straightforward /usr/bin/perl shebang so rpmbuild catches it and autogenerates better dependencies. --- cvs2cl~ 2007-02-04 22:22:11.000000000 +0200 +++ cvs2cl 2007-03-31 00:37:30.000000000 +0300 @@ -1,7 +1,4 @@ -#!/bin/sh -exec perl -w -x $0 ${1+"$@"} # -*- mode: perl; perl-indent-level: 2; -*- -#!perl -w - +#!/usr/bin/perl -w ############################################################## ### ### Index: cvs2cl.spec =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/devel/cvs2cl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cvs2cl.spec 22 Dec 2006 21:35:57 -0000 1.12 +++ cvs2cl.spec 30 Mar 2007 21:45:51 -0000 1.13 @@ -1,6 +1,6 @@ Name: cvs2cl -Version: 2.59 -Release: 5%{?dist} +Version: 2.60 +Release: 1%{?dist} Summary: Generate ChangeLogs from CVS working copies Group: Development/Tools @@ -15,11 +15,11 @@ Source6: http://www.red-bean.com/cvs2cl/cvs2cl_ruether.xslt Source7: http://www.red-bean.com/cvs2cl/cl2html_rss-karaguezian.xslt Source8: http://www.red-bean.com/cvs2cl/ChangeLog.xsd +Patch0: %{name}-2.60-perldeps.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl -Requires: perl +BuildRequires: %{_bindir}/pod2man Requires: xml-common %description @@ -31,6 +31,7 @@ %prep %setup -c -T sed -e 's/cvs2cl\.pl/cvs2cl/' %{SOURCE0} > cvs2cl +%patch0 %build @@ -70,6 +71,10 @@ %changelog +* Sat Mar 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.60-1 +- 2.60. +- Dependency fixups. + * Fri Dec 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.59-5 - Eliminate unnecessary file based dependencies. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cvs2cl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2006 15:17:36 -0000 1.2 +++ sources 30 Mar 2007 21:45:51 -0000 1.3 @@ -4,6 +4,6 @@ f5af372c18e9199955d87f9da009b697 cl2html-ciaglia.xslt 1b6c38d10a73eb1667550d2b56bcf3b9 cl2html_rss-karaguezian.xslt de54d6ce72570c845ef5a0dcc8bf9399 cl2html.xslt -2267d1023719f72358d2739e41ca984c cvs2cl.pl +30b45da870831c764473e63e5dfd8fe5 cvs2cl.pl f7d7cf88b314c0cb1a16c8c93d1c8e54 cvs2cl_ruether.xslt 6c521f9e2b2ae5fbcee63b3c2f47d607 filter-cvs2cl.xslt

1 0

rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.18,1.19
by fedora-extras-commits＠redhat.com 30 Mar '07

30 Mar '07

Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17277/devel Modified Files: R-RScaLAPACK.spec Log Message: Fix building against new lam. Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- R-RScaLAPACK.spec 4 Oct 2006 22:57:41 -0000 1.18 +++ R-RScaLAPACK.spec 30 Mar 2007 21:15:21 -0000 1.19 @@ -1,9 +1,15 @@ %define packname RScaLAPACK %define lamdir %{_libdir}/lam +%ifarch x86_64 ia64 +%define bitsize 64 +%else +%define bitsize 32 +%endif + Name: R-%{packname} Version: 0.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib @@ -45,7 +51,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library -%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} +%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -I%{_includedir}/lam/%{bitsize} -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -I%{_includedir}/lam/%{bitsize} -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} # %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css @@ -65,6 +71,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Fri Mar 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.5.1-9 +- include bitsize specific lam include directory + * Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.5.1-8 - rebuilt for unwind info generation, broken in gcc-4.1.1-21

1 0

rpms/R-RScaLAPACK/FC-6 R-RScaLAPACK.spec,1.18,1.19
by fedora-extras-commits＠redhat.com 30 Mar '07

30 Mar '07

Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17277/FC-6 Modified Files: R-RScaLAPACK.spec Log Message: Fix building against new lam. Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-6/R-RScaLAPACK.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- R-RScaLAPACK.spec 4 Oct 2006 22:57:41 -0000 1.18 +++ R-RScaLAPACK.spec 30 Mar 2007 21:15:17 -0000 1.19 @@ -1,9 +1,15 @@ %define packname RScaLAPACK %define lamdir %{_libdir}/lam +%ifarch x86_64 ia64 +%define bitsize 64 +%else +%define bitsize 32 +%endif + Name: R-%{packname} Version: 0.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib @@ -45,7 +51,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library -%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} +%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -I%{_includedir}/lam/%{bitsize} -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -I%{_includedir}/lam/%{bitsize} -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} # %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css @@ -65,6 +71,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Fri Mar 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.5.1-9 +- include bitsize specific lam include directory + * Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.5.1-8 - rebuilt for unwind info generation, broken in gcc-4.1.1-21

1 0

fedora-accounts website.py,1.2,1.3
by fedora-extras-commits＠redhat.com 30 Mar '07

30 Mar '07

Author: toshio Update of /cvs/fedora/fedora-accounts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12247 Modified Files: website.py Log Message: * Convert tabs into four spaces. Index: website.py =================================================================== RCS file: /cvs/fedora/fedora-accounts/website.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- website.py 11 Jul 2006 09:13:08 -0000 1.2 +++ website.py 30 Mar 2007 20:10:09 -0000 1.3 @@ -168,11 +168,11 @@ def get_dbh(dbtype='auth', dbctx=None): dbname = dbname_map.get(dbtype, dbtype) if dbctx is None: - hn = socket.gethostname() - if hn.find('devel.redhat.com') >= 0: - dbctx = 'devel' - else: - dbctx = dbctx_map.get(dbname, 'live') + hn = socket.gethostname() + if hn.find('devel.redhat.com') >= 0: + dbctx = 'devel' + else: + dbctx = dbctx_map.get(dbname, 'live') dbcnx = dbcnx_map[dbctx] dbhost = dbcnx['host'] dbuser = dbcnx['user'] @@ -229,7 +229,7 @@ if not x: auth_username = auth_password = None else: - auth_username = x + auth_username = x if not (auth_username or not auth_password): if c.has_key('auth_username'): del c['auth_username'] @@ -324,10 +324,11 @@ if form.has_key('auth_password'): print 'Username or password not valid. <a href="%s/reset-password.cgi?username=%s">Reset password</a><br>' % (accounts_url, auth_username) print """<form method=post action="%s">Username: <input type=text name=auth_username value="%s"><br>Password: <input type=password name=auth_password><br><input type=submit value=Login>""" % (url, auth_username) - for I in form.keys(): - if I in ('auth_username', 'auth_password'): continue - print '<input type=hidden name="%s" value="%s">' % (I, form[I].value) - print "</form>" + for I in form.keys(): + if I in ('auth_username', 'auth_password'): + continue + print '<input type=hidden name="%s" value="%s">' % (I, form[I].value) + print "</form>" do_error(title) return auth_username, auth_password @@ -358,11 +359,11 @@ if arow: # Group owner default_retval = 'administrator' if require_role_type: - if isinstance(require_role_type, tuple) or isinstance(require_role_type, list): - qry += ' AND role.role_type IN %s' - else: + if isinstance(require_role_type, tuple) or isinstance(require_role_type, list): + qry += ' AND role.role_type IN %s' + else: require_role_type = role_type_names[role_type_names.index(require_role_type):] - qry += ' AND role.role_type IN %s' + qry += ' AND role.role_type IN %s' qargs.append(require_role_type) if require_role_domain: qry += " AND (role.role_domain + '%%') LIKE %s" @@ -384,18 +385,18 @@ ginfo = get_group_info(dbh, groupname) my_group_info.update(ginfo) if my_group_info['name'] == 'cla_done': - return [] + return [] x = have_group(dbh, auth_username, groupname, group_info=my_group_info) if x: - allowed_actions.append(x) - allowed_actions.append('member') + allowed_actions.append(x) + allowed_actions.append('member') if my_group_info.get('user_can_remove', 1): allowed_actions.extend(['remove_self']) if x in ('sponsor', 'administrator') and my_group_info.get('needs_sponsor'): allowed_actions.extend(['sponsor']) if x in ('administrator', 'sponsor'): allowed_actions.extend(['decline', 'remove']) - if not my_group_info.get('needs_sponsor'): + if not my_group_info.get('needs_sponsor'): allowed_actions.extend(['approve']) if x == 'administrator': allowed_actions.extend(['upgrade', 'downgrade']) @@ -466,8 +467,8 @@ cc=group_info['email']) else: print "'Add' action denied." - if not group_info: - print " The %s group doesn't seem to exist." % (role_group,) + if not group_info: + print " The %s group doesn't seem to exist." % (role_group,) elif group_info['prerequisite_id']: print " You may need to become a member of the %s group first." % (get_group_info(dbh, group_info['prerequisite_id'])['name']) @@ -485,7 +486,8 @@ role_user_id = get_user_id(dbh, role_user) assert role_user_id, role_user - if role_domain == 'None': role_domain = None + if role_domain == 'None': + role_domain = None allowed_actions = get_allowed_group_actions(dbh, auth_username, role_group, for_username=role_user) if role_user_id == auth_user_id: @@ -494,12 +496,12 @@ permitted = 'remove' in allowed_actions if permitted: - if role_domain is None: - rdc = "IS NULL" - qargs = (role_user_id, role_group_id) - else: - rdc = " = %s" - qargs = (role_user_id, role_group_id, role_domain) + if role_domain is None: + rdc = "IS NULL" + qargs = (role_user_id, role_group_id) + else: + rdc = " = %s" + qargs = (role_user_id, role_group_id, role_domain) dbc.execute("DELETE FROM role WHERE person_id = %s AND project_group_id = %s AND role_domain " + rdc, qargs) else: @@ -625,8 +627,8 @@ continue new_type = role_type_names[new_type_num] if arow and the_action in allowed_actions: - qry = "UPDATE role SET role_type = %s WHERE person_id = %s AND project_group_id = %s AND role_domain = %s" - qargs = (new_type, role_user_id, role_group_id, role_domain) + qry = "UPDATE role SET role_type = %s WHERE person_id = %s AND project_group_id = %s AND role_domain = %s" + qargs = (new_type, role_user_id, role_group_id, role_domain) dbc.execute(qry, qargs) uinfo = get_user_info(dbh, role_user_id) authi = get_user_info(dbh, auth_user_id) @@ -665,15 +667,15 @@ (role_user_id, role_group_id, role_domain)) arow = dbc.fetchone() if arow and not arow[0] and 'sponsor' in allowed_actions: - if arow[2]: - qstat = "role_status = %s, " - qsa = ('approved',) - else: - qstat = "" - qsa = () - assert 0 - qry = "UPDATE role SET " + qstat + "sponsor_id = %s, approval = NOW() WHERE person_id = %s AND project_group_id = %s AND role_domain = %s AND sponsor_id IS NULL" - qargs = qsa + (auth_user_id, role_user_id, role_group_id, role_domain) + if arow[2]: + qstat = "role_status = %s, " + qsa = ('approved',) + else: + qstat = "" + qsa = () + assert 0 + qry = "UPDATE role SET " + qstat + "sponsor_id = %s, approval = NOW() WHERE person_id = %s AND project_group_id = %s AND role_domain = %s AND sponsor_id IS NULL" + qargs = qsa + (auth_user_id, role_user_id, role_group_id, role_domain) dbc.execute(qry, qargs) uinfo = get_user_info(dbh, role_user_id) authi = get_user_info(dbh, auth_user_id) @@ -742,17 +744,17 @@ rsa_value = None rsu_value = None if form.has_key('_role_show_all'): - rsa_value = form['_role_show_all'].value + rsa_value = form['_role_show_all'].value if form.has_key('_role_show_unapproved'): - rsu_value = form['_role_show_unapproved'].value + rsu_value = form['_role_show_unapproved'].value if rsa_value and rsa_value[:4].lower() == 'show': role_show = 'all' elif rsu_value and rsu_value[:4].lower() == 'show': role_show = 'unapproved' elif rsa_value: - role_show = 'all' + role_show = 'all' elif rsu_value: - role_show = 'unapproved' + role_show = 'unapproved' if role_show == 'unapproved': qspecs.append("role_status = 'unapproved'") assert qtables @@ -806,10 +808,10 @@ print ' <input type=submit name=_role_show_%s value="Show %s">' % (I, I) print "</td></tr><tr><th></th><th>Group Name</th><th>Username</th><th>Role Domain</th><th>Role Type</th><th>Role Status</th><th>Sponsor</th></tr>" - if groupname: - allowed_actions = get_allowed_group_actions(dbh, auth_username, groupname) - else: - allowed_actions = get_allowed_group_actions(dbh, auth_username, 'accounts') # XXX fixme badhack yuk + if groupname: + allowed_actions = get_allowed_group_actions(dbh, auth_username, groupname) + else: + allowed_actions = get_allowed_group_actions(dbh, auth_username, 'accounts') # XXX fixme badhack yuk got_needs_sponsor = 0 got_needs_review = 0 while 1: @@ -818,9 +820,9 @@ print '<tr><td><input type=checkbox name=existing_roles value="%s!%s!%s"></td>' % (arow['name'], arow['username'], arow['role_domain']) - arow['print_role_status'] = arow['role_status'] - if arow['print_role_status'] not in ('unapproved', 'approved', 'declined'): - arow['print_role_status'] = 'In progress' + arow['print_role_status'] = arow['role_status'] + if arow['print_role_status'] not in ('unapproved', 'approved', 'declined'): + arow['print_role_status'] = 'In progress' for I in ('name', 'username', 'role_domain', 'role_type', 'print_role_status'): if I == 'username': print """<td><a href="userbox.cgi?_editme=Edit&username=%s">%s</a></td>""" % (arow[I], arow[I]) @@ -847,8 +849,8 @@ if 'sponsor' in allowed_actions and got_needs_sponsor: print '<input type=submit name=_role_sponsor value="Sponsor Selected">' -# else: -# print " got_needs_sponsor %s, actions %s " % (got_needs_sponsor, allowed_actions) +# else: +# print " got_needs_sponsor %s, actions %s " % (got_needs_sponsor, allowed_actions) if 'approve' in allowed_actions and got_needs_review: print '<input type=submit name=_role_approve value="Approve Selected">' if 'decline' in allowed_actions and got_needs_review:

1 0

fedora-accounts bz-make-components.py,1.11,1.12
by fedora-extras-commits＠redhat.com 30 Mar '07

30 Mar '07

Author: toshio Update of /cvs/fedora/fedora-accounts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7330 Modified Files: bz-make-components.py Log Message: * bz-make-components.py: Reformat for consistent 4 spaces per indent level instead of mixed tabs, 2 & 4 spaces. Index: bz-make-components.py =================================================================== RCS file: /cvs/fedora/fedora-accounts/bz-make-components.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bz-make-components.py 26 Feb 2007 20:24:51 -0000 1.11 +++ bz-make-components.py 30 Mar 2007 19:27:58 -0000 1.12 @@ -11,17 +11,18 @@ GRANT_REGEXP = 2 def get_bz_user_id(bzdbh, username): - bzdbc = bzdbh.cursor() - bzdbc.execute("SELECT userid FROM profiles WHERE login_name = %s", (username,)) - if bzdbc.rowcount: - return bzdbc.fetchone()[0] + bzdbc = bzdbh.cursor() + bzdbc.execute("SELECT userid FROM profiles WHERE login_name = %s", + (username,)) + if bzdbc.rowcount: + return bzdbc.fetchone()[0] opts, args = getopt.getopt(sys.argv[1:], '', ('usage', 'help')) if len(args) < 1 or ('--usage','') in opts or ('--help','') in opts: - print """ + print """ Usage: bz-make-components.py FILENAME... """ - sys.exit(1) + sys.exit(1) bzdbh = website.get_dbh('bugs', 'bugs') bzdbc = bzdbh.cursor() @@ -29,82 +30,84 @@ bzdbh.commit() need_emails = {} for curfile in args: - if not os.path.exists(curfile): - continue - fh = open(curfile, 'r') - lnum = 0 - while 1: - aline = fh.readline() - lnum += 1 - if not aline: break - aline = aline.strip() - if not aline or aline[0] == '#': continue - - pieces = aline.split('|') - try: - product, component, description, owner, qa = pieces[:5] - except: - print "Invalid line %s at %s:%s" % (aline, curfile, lnum) - cclist = [] - owners = owner.split(',') - owner = owners[0] - if len(owners) > 1: + if not os.path.exists(curfile): + continue + fh = open(curfile, 'r') + lnum = 0 + while 1: + aline = fh.readline() + lnum += 1 + if not aline: + break + aline = aline.strip() + if not aline or aline[0] == '#': + continue + + pieces = aline.split('|') + try: + product, component, description, owner, qa = pieces[:5] + except: + print "Invalid line %s at %s:%s" % (aline, curfile, lnum) + cclist = [] + owners = owner.split(',') + owner = owners[0] + if len(owners) > 1: for I in owners[1:]: - Inum = get_bz_user_id(bzdbh, I) - if Inum is None: - if not need_emails.has_key(I): - need_emails[I] = [] - need_emails[I].append((product, component, curfile, lnum)) - continue - cclist.append(Inum) - owner_num = get_bz_user_id(bzdbh, owner) - qa_num = get_bz_user_id(bzdbh, qa) - if owner_num is None: - if not need_emails.has_key(owner): - need_emails[owner] = [] - need_emails[owner].append((product, component, curfile, lnum)) -# print "Invalid owner %s at %s:%s" % (owner, curfile, lnum) - continue - if len(pieces) > 5 and pieces[5]: - for I in pieces[5].split(','): - Inum = get_bz_user_id(bzdbh, I) - if Inum is None: - if not need_emails.has_key(I): - need_emails[I] = [] - need_emails[I].append((product, component, curfile, lnum)) - continue - cclist.append(Inum) - - if product[:len('Fedora ')] != 'Fedora ' or product == 'Fedora Core' or product == 'Fedora Legacy': - print "Invalid product %s at %s:%s" % (product, curfile, lnum) - continue - - bzdbc.execute("SELECT id FROM products WHERE name = %s", (product,)) - if not bzdbc.rowcount: - bzdbc.execute("INSERT INTO products (name, description, disallownew, votesperuser, maxvotesperbug, votestoconfirm, defaultmilestone, depends) VALUES (%s, %s, %s, %s, %s, %s, %s, %s)", (product, product, 0, 0, 10000, 0, '---', 0)) - bzdbc.execute("SELECT id FROM products WHERE name = %s", (product,)) - product_id = bzdbc.fetchone()[0] - bzdbc.execute("INSERT INTO versions (value, product_id) VALUES (%s, %s)", ("development", product_id)) - bzdbc.execute("INSERT INTO milestones (product_id, value, sortkey) VALUES (%s, '---', 0)", (product_id,)) - else: - product_id = bzdbc.fetchone()[0] - - bzdbc.execute("SELECT * FROM components WHERE product_id = %s AND name = %s", (product_id, component)) - if bzdbc.rowcount: - arow = bzdbc.fetchhash() - bzdbc.execute("UPDATE components SET initialowner = %s, initialqacontact = %s, initialcclist = %s WHERE id = %s", - (owner_num, qa_num, ':'.join(map(str,cclist)), arow['id'])) - else: - bzdbc.execute("INSERT INTO components (name, product_id, description, initialowner, initialqacontact, initialcclist) VALUES (%s, %s, %s, %s, %s, %s)", - (component, product_id, description, owner_num, qa_num, ':'.join(map(str,cclist)))) + Inum = get_bz_user_id(bzdbh, I) + if Inum is None: + if not need_emails.has_key(I): + need_emails[I] = [] + need_emails[I].append((product, component, curfile, lnum)) + continue + cclist.append(Inum) + owner_num = get_bz_user_id(bzdbh, owner) + qa_num = get_bz_user_id(bzdbh, qa) + if owner_num is None: + if not need_emails.has_key(owner): + need_emails[owner] = [] + need_emails[owner].append((product, component, curfile, lnum)) +# print "Invalid owner %s at %s:%s" % (owner, curfile, lnum) + continue + if len(pieces) > 5 and pieces[5]: + for I in pieces[5].split(','): + Inum = get_bz_user_id(bzdbh, I) + if Inum is None: + if not need_emails.has_key(I): + need_emails[I] = [] + need_emails[I].append((product, component, curfile, lnum)) + continue + cclist.append(Inum) + + if product[:len('Fedora ')] != 'Fedora ' or product == 'Fedora Core' or product == 'Fedora Legacy': + print "Invalid product %s at %s:%s" % (product, curfile, lnum) + continue + + bzdbc.execute("SELECT id FROM products WHERE name = %s", (product,)) + if not bzdbc.rowcount: + bzdbc.execute("INSERT INTO products (name, description, disallownew, votesperuser, maxvotesperbug, votestoconfirm, defaultmilestone, depends) VALUES (%s, %s, %s, %s, %s, %s, %s, %s)", (product, product, 0, 0, 10000, 0, '---', 0)) + bzdbc.execute("SELECT id FROM products WHERE name = %s", (product,)) + product_id = bzdbc.fetchone()[0] + bzdbc.execute("INSERT INTO versions (value, product_id) VALUES (%s, %s)", ("development", product_id)) + bzdbc.execute("INSERT INTO milestones (product_id, value, sortkey) VALUES (%s, '---', 0)", (product_id,)) + else: + product_id = bzdbc.fetchone()[0] + + bzdbc.execute("SELECT * FROM components WHERE product_id = %s AND name = %s", (product_id, component)) + if bzdbc.rowcount: + arow = bzdbc.fetchhash() + bzdbc.execute("UPDATE components SET initialowner = %s, initialqacontact = %s, initialcclist = %s WHERE id = %s", + (owner_num, qa_num, ':'.join(map(str,cclist)), arow['id'])) + else: + bzdbc.execute("INSERT INTO components (name, product_id, description, initialowner, initialqacontact, initialcclist) VALUES (%s, %s, %s, %s, %s, %s)", + (component, product_id, description, owner_num, qa_num, ':'.join(map(str,cclist)))) bzdbh.commit() for I, J in need_emails.items(): - if not I.strip(): - print "Need an e-mail for", J - continue - print "Sending e-mail to", I - website.send_email("accounts(a)fedora.redhat.com", I, "You need to create a bugzilla account for %s" % I, """ + if not I.strip(): + print "Need an e-mail for", J + continue + print "Sending e-mail to", I + website.send_email("accounts(a)fedora.redhat.com", I, "You need to create a bugzilla account for %s" % I, """ In order to make bugzilla components for Fedora-related programs, we need to have an existing bugzilla account for the listed owner. You (%s) do not have a bugzilla account, but are listed as the owner for the following components: %s

1 0

← Newer
1
2
3
4
5
6
7
...
393
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits March 2007