devel/fping fping.spec,1.1,1.2
by fedora-extras-commits@redhat.com
Author: kaboom
Update of /cvs/extras/devel/fping
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25764
Modified Files:
fping.spec
Log Message:
Add dist tag
Index: fping.spec
===================================================================
RCS file: /cvs/extras/devel/fping/fping.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fping.spec 16 May 2005 21:49:06 -0000 1.1
+++ fping.spec 1 Jun 2005 10:19:27 -0000 1.2
@@ -1,6 +1,6 @@
Name: fping
Version: 2.4b2
-Release: 3
+Release: 3%{?dist}
Summary: Scriptable, parallelized ping-like utility
Group: Applications/Internet
License: BSD
@@ -43,6 +43,9 @@
%{_mandir}/man8/*
%changelog
+* Wed Jun 01 2005 Chris Ricker <kaboom(a)oobleck.net> 2.4b2-3%{?dist}
+- Add dist tag
+
* Mon May 16 2005 Chris Ricker <kaboom(a)oobleck.net> 2.4b2-3
- Simplify doc packaging (Matthias Saou)
- Simplify clean (Matthias Saou)
17 years, 9 months
common tobuild,1.1027,1.1028
by fedora-extras-commits@redhat.com
Author: kaboom
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25741
Modified Files:
tobuild
Log Message:
request build of rpms/fping/FC-4 fping-2_4b2-3_fc4 for fc4
Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1027
retrieving revision 1.1028
diff -u -r1.1027 -r1.1028
--- tobuild 1 Jun 2005 09:16:45 -0000 1.1027
+++ tobuild 1 Jun 2005 10:18:19 -0000 1.1028
@@ -18,3 +18,4 @@
kevin rpms/exo/devel exo-0_3_0-6_fc5 devel
pghmcfc rpms/bittorrent/devel bittorrent-4_1_1-1_fc5 devel
mschwendt rpms/psi/FC-4 psi-0_9_3-4_fc4 fc4
+kaboom rpms/fping/FC-4 fping-2_4b2-3_fc4 fc4
17 years, 9 months
rpms/fping/FC-4 fping.spec,1.1,1.2
by fedora-extras-commits@redhat.com
Author: kaboom
Update of /cvs/extras/rpms/fping/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25713
Modified Files:
fping.spec
Log Message:
Add dist tag
Index: fping.spec
===================================================================
RCS file: /cvs/extras/rpms/fping/FC-4/fping.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fping.spec 16 May 2005 21:49:06 -0000 1.1
+++ fping.spec 1 Jun 2005 10:18:08 -0000 1.2
@@ -1,6 +1,6 @@
Name: fping
Version: 2.4b2
-Release: 3
+Release: 3%{?dist}
Summary: Scriptable, parallelized ping-like utility
Group: Applications/Internet
License: BSD
@@ -43,6 +43,9 @@
%{_mandir}/man8/*
%changelog
+* Wed Jun 01 2005 Chris Ricker <kaboom(a)oobleck.net> 2.4b2-3%{?dist}
+- Add dist tag
+
* Mon May 16 2005 Chris Ricker <kaboom(a)oobleck.net> 2.4b2-3
- Simplify doc packaging (Matthias Saou)
- Simplify clean (Matthias Saou)
17 years, 9 months
common tobuild,1.1026,1.1027
by fedora-extras-commits@redhat.com
Author: mschwendt
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24550
Modified Files:
tobuild
Log Message:
request build of rpms/psi/FC-4 psi-0_9_3-4_fc4 for fc4
Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1026
retrieving revision 1.1027
diff -u -r1.1026 -r1.1027
--- tobuild 1 Jun 2005 05:51:37 -0000 1.1026
+++ tobuild 1 Jun 2005 09:16:45 -0000 1.1027
@@ -17,3 +17,4 @@
nhorman rpms/iozone/FC-3 iozone-3-1_fc3 fc3
kevin rpms/exo/devel exo-0_3_0-6_fc5 devel
pghmcfc rpms/bittorrent/devel bittorrent-4_1_1-1_fc5 devel
+mschwendt rpms/psi/FC-4 psi-0_9_3-4_fc4 fc4
17 years, 9 months
rpms/psi/FC-4 psi-0.9.3-gcc4.patch,NONE,1.1 psi.spec,1.11,1.12
by fedora-extras-commits@redhat.com
Author: mschwendt
Update of /cvs/extras/rpms/psi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24478
Modified Files:
psi.spec
Added Files:
psi-0.9.3-gcc4.patch
Log Message:
[might need further patches - this is where it broke on x86_64 first]
* Wed Jun 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-4
- patch it for 64-bit/GCC 4
psi-0.9.3-gcc4.patch:
--- NEW FILE psi-0.9.3-gcc4.patch ---
diff -Nur psi-0.9.3-orig/libpsi/psiwidgets/iconaction.cpp psi-0.9.3/libpsi/psiwidgets/iconaction.cpp
--- psi-0.9.3-orig/libpsi/psiwidgets/iconaction.cpp 2004-10-24 11:42:19.000000000 +0200
+++ psi-0.9.3/libpsi/psiwidgets/iconaction.cpp 2005-06-01 07:32:53.000000000 +0200
@@ -71,7 +71,7 @@
QMap<QPopupMenu *, int>::Iterator it = popups.begin();
for ( ; it != popups.end(); ++it ) {
- if ( (int)it.key() == (int)obj ) {
+ if ( it.key() == obj ) {
dirty = true;
popups.remove( it );
break;
Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/psi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- psi.spec 22 May 2005 23:45:43 -0000 1.11
+++ psi.spec 1 Jun 2005 09:16:06 -0000 1.12
@@ -3,9 +3,8 @@
Name: psi
Version: 0.9.3
-Release: 3%{?dist}
-
-Summary: Jabber client using QT3
+Release: 4%{?dist}
+Summary: Jabber client using Qt 3
License: GPL
Group: Applications/Internet
URL: http://psi.affinix.com/
@@ -13,6 +12,7 @@
Source2: psi-uicwrapper.sh
Patch1: psi-0.9.2-strip.patch
Patch2: psi-0.9.2-mach-build.patch
+Patch3: psi-0.9.3-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -114,6 +114,8 @@
%patch1 -p1 -b .strip
# needed to build with mach
%patch2 -p1 -b .mach-build
+%patch3 -p1 -b .gcc4
+
%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -228,10 +230,13 @@
%changelog
-* Sun May 22 2005 Jeremy Katz <katzj(a)redhat.com> - 0.9.3
+* Wed Jun 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-4
+- patch it for 64-bit/GCC 4
+
+* Sun May 22 2005 Jeremy Katz <katzj(a)redhat.com> - 0.9.3-3
- rebuild on all arches
-* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-2
- rebuilt
* Sun Jan 09 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.9.3-1
17 years, 9 months
common tobuild,1.1025,1.1026
by fedora-extras-commits@redhat.com
Author: pghmcfc
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19495
Modified Files:
tobuild
Log Message:
request build of rpms/bittorrent/devel bittorrent-4_1_1-1_fc5 for devel
Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1025
retrieving revision 1.1026
diff -u -r1.1025 -r1.1026
--- tobuild 1 Jun 2005 03:16:33 -0000 1.1025
+++ tobuild 1 Jun 2005 05:51:37 -0000 1.1026
@@ -16,3 +16,4 @@
nhorman rpms/iozone/devel iozone-3-1_fc4 devel
nhorman rpms/iozone/FC-3 iozone-3-1_fc3 fc3
kevin rpms/exo/devel exo-0_3_0-6_fc5 devel
+pghmcfc rpms/bittorrent/devel bittorrent-4_1_1-1_fc5 devel
17 years, 9 months
extras-buildsys/utils extras-push.py,NONE,1.1
by fedora-extras-commits@redhat.com
Author: skvidal
Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18316/utils
Added Files:
extras-push.py
Log Message:
add extras-push.py to extras-buildsys dir
--- NEW FILE extras-push.py ---
#!/usr/bin/python -t
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import os
import sys
import rpmUtils
import smtplib
import shutil
import string
from email.MIMEText import MIMEText
# get the path to where to look for the packages to be signed
# get the list of stuff there (logs, md5sums, specs, rpms)
# list the rpms and pause
# sign the rpms
# collect list of srpms and get package n-v-r from them
# move pkgs into repo
# repomanage?
# make repo
# make repoview
# email to fedora-extras-list with the built packages list
# sing, dance, romance
stagesdir = '/rpmbuild/extras/stages'
treedir = '/rpmbuild/extras/tree/extras'
compsname = 'comps.xml'
archdict = {'3':['x86_64', 'i386'],
'development':['ppc','x86_64','i386'],
'4':['ppc','x86_64', 'i386']}
ts = rpmUtils.transaction.initReadOnlyTransaction()
DEBUG = False
def debugprint(msg):
if DEBUG:
print msg
def find_files(path):
"""returns a dict of filetypes and paths to those files"""
filedict = {}
filedict['srpm'] = []
filedict['log'] = []
filedict['rpm'] = []
filedict['spec'] = []
filedict['md5sum'] = []
filedict['debuginfo'] = []
filedict['other'] = []
for root, dirs, files in os.walk(path):
for file in files:
# match the files to what list they should be in
if file.endswith('.log'):
which = 'log'
elif file.endswith('.rpm'):
if file.find('debuginfo') != -1:
which = 'debuginfo'
elif file.endswith('.src.rpm'):
which = 'srpm'
else:
which = 'rpm'
elif file.endswith('.spec'):
which = 'spec'
elif file.endswith('.md5sum'):
which = 'md5sum'
else:
which = 'other'
fullfile = os.path.join(root, file)
filedict[which].append(fullfile)
return filedict
def naevr(pkg):
"""return nevra from the package srpm"""
hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg)
name = hdr['name']
ver = hdr['version']
rel = hdr['release']
arch = hdr['arch']
epoch = hdr['epoch']
if epoch is None:
epoch = 0
return (name, arch, epoch, ver, rel)
def email_list(pkglist, dist):
"""email extras list with the new package listing"""
mail_from = 'buildsys(a)fedoraproject.org'
mail_to = 'fedora-extras-list(a)redhat.com'
uniqued = rpmUtils.miscutils.unique(pkglist)
uniqued.sort()
output = "\nPackages built and released for Fedora Extras %s: %s \n\n" % (dist, len(uniqued))
for pkg in uniqued:
add = '%s\n' % (pkg)
output = output + add
end = """
For more information about the built packages please see the repository
or the fedora Info Feed: http://fedoraproject.org/infofeed/
"""
output = output + end
msg = MIMEText(output)
subject = 'Fedora Extras %s Package Build Report' % dist
msg['Subject'] = subject
msg['From'] = mail_from
msg['To'] = mail_to
s = smtplib.SMTP()
s.connect()
s.sendmail(mail_from, [mail_to], msg.as_string())
s.close()
def sign_pkgs(filelist):
"""gpg sign all the rpms"""
numfiles = len(filelist)
if numfiles < 1:
print "No packages to sign"
return False
while numfiles > 0:
if numfiles > 256:
files = filelist[:256]
del filelist[:256]
else:
files = filelist
filelist = []
foo = string.join(files)
result = os.system('echo %s | xargs rpm --resign' % foo)
if result != 0:
return False
numfiles = len(filelist)
return True
def main(dist):
if not archdict.has_key(dist):
print "No Distribution named %s found" % dist
sys.exit(1)
needsign = os.path.join(stagesdir, 'needsign', dist)
files = find_files(needsign)
destdir = os.path.join(treedir, dist)
if not os.path.exists(destdir):
for arch in archdict[dist]:
os.makedirs(destdir + '/' + arch + '/debug')
os.makedirs(destdir + '/' + 'SRPMS')
rpms = files['rpm'] + files['srpm'] + files['debuginfo']
print "Signing Packages:"
result = sign_pkgs(rpms)
if not result:
print "Error signing packages"
sys.exit(2)
infolist = []
for package in files['srpm']:
(n,a,e,v,r) = naevr(package)
infolist.append('%s-%s-%s' % (n,v,r))
pkg_fn = os.path.basename(package)
srpmloc = os.path.join(destdir, 'SRPMS', pkg_fn)
if os.path.exists(srpmloc):
debugprint('Deleting %s' % srpmloc)
os.unlink(srpmloc)
debugprint('Moving %s to %s' % (package, srpmloc))
shutil.move(package, srpmloc)
# go through each package and move it to the right arch location.
# if it is a noarch package, copy2 it to all arch locations and unlink it
# if it is a debuginfo package move it into the 'debug' dir for that arch
print "Moving Packages into Place"
for package in files['rpm'] + files['debuginfo']:
pkg_fn = os.path.basename(package)
(n,a,e,v,r) = naevr(package)
if a == 'noarch':
for arch in archdict[dist]:
if package in files['debuginfo']:
arch = '%s/debug' % arch
rpmloc = os.path.join(destdir, arch, pkg_fn)
debugprint("Copying %s to %s" % (package, rpmloc))
shutil.copy(package, rpmloc)
os.unlink(package)
continue
elif a in ['i386', 'i486', 'i586', 'i686', 'athlon']:
if package in files['debuginfo']:
arch = 'i386/debug'
else:
arch = 'i386'
elif a in ['x86_64', 'ia32e', 'amd64']:
if package in files['debuginfo']:
arch = 'x86_64/debug'
else:
arch = 'x86_64'
elif a in ['ppc', 'ppc64', 'ppc32']:
if package in files['debuginfo']:
arch = 'ppc/debug'
else:
arch = 'ppc'
else:
print 'Unknown arch %s' % a
continue
rpmloc = os.path.join(destdir, arch, pkg_fn)
debugprint('Moving %s to %s' % (package, rpmloc))
shutil.move(package, rpmloc)
print "Making Repository Metadata"
# SRPM repo creation
repodir = os.path.join(destdir, 'SRPMS')
rpdata = os.path.join(repodir, 'repodata')
debugprint('removing tree %s' % rpdata)
shutil.rmtree(rpdata)
cmd = '/usr/bin/createrepo -q %s' % repodir
debugprint(cmd)
result = os.system(cmd)
cmd = '/usr/bin/repoview %s' % repodir
debugprint(cmd)
result = os.system(cmd)
# arch repo creation
for arch in archdict[dist]:
repodir = os.path.join(destdir, arch)
compspath = os.path.join(repodir, compsname)
rpdata = os.path.join(repodir, 'repodata')
debugprint('removing tree %s' % rpdata)
shutil.rmtree(rpdata)
if os.path.exists(compspath):
cmd = '/usr/bin/createrepo -q -g %s -x *debuginfo* %s' % (compsname, repodir)
else:
cmd = '/usr/bin/createrepo -q -x *debuginfo* %s' % repodir
debugprint(cmd)
result = os.system(cmd)
cmd = '/usr/bin/repoview %s' % repodir
debugprint(cmd)
result = os.system(cmd)
dbg_repodir = os.path.join(destdir, arch, 'debug')
dbg_rpdata = os.path.join(dbg_repodir, 'repodata')
debugprint('removing tree %s' % dbg_rpdata)
shutil.rmtree(dbg_rpdata)
cmd = '/usr/bin/createrepo -q %s' % dbg_repodir
debugprint(cmd)
result = os.system(cmd)
cmd = '/usr/bin/repoview %s' % dbg_repodir
debugprint(cmd)
result = os.system(cmd)
# email the list
print "Emailing info"
email_list(infolist, dist)
# clean up the crap
print "Cleaning Up"
for file in files['log'] + files['md5sum'] + files['spec']:
debugprint('removing %s' % file)
os.unlink(file)
# FIXME clean up empty dirs, too.
if __name__ == '__main__':
me = os.getcwd()
if len(sys.argv) < 2:
print "Usage:\nextras-push.py release\n\n"
sys.exit(1)
main(sys.argv[1])
os.chdir(me)
17 years, 9 months
extras-buildsys/utils - New directory
by fedora-extras-commits@redhat.com
Author: skvidal
Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18299/utils
Log Message:
Directory /cvs/fedora/extras-buildsys/utils added to the repository
17 years, 9 months
extras-buildsys - Imported sources
by fedora-extras-commits@redhat.com
Author: skvidal
Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18273
Log Message:
Create extras-buildsys
Status:
Vendor Tag: extras-buildsys
Release Tags: start
N extras-buildsys/README
N extras-buildsys/ChangeLog
N extras-buildsys/client/fileserver.py
N extras-buildsys/client/archwelder.py
N extras-buildsys/client/archwelder_config.py
N extras-buildsys/server/CONFIG.py
N extras-buildsys/server/aw_manager.py
N extras-buildsys/server/buildmaster.py
N extras-buildsys/server/bm_server.py
N extras-buildsys/server/buildjob.py
No conflicts created by this import
17 years, 9 months
common tobuild,1.1024,1.1025
by fedora-extras-commits@redhat.com
Author: kevin
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17222
Modified Files:
tobuild
Log Message:
request build of rpms/exo/devel exo-0_3_0-6_fc5 for devel
Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1024
retrieving revision 1.1025
diff -u -r1.1024 -r1.1025
--- tobuild 1 Jun 2005 02:48:49 -0000 1.1024
+++ tobuild 1 Jun 2005 03:16:33 -0000 1.1025
@@ -15,3 +15,4 @@
mfleming rpms/mlmmj/FC-4 mlmmj-1_2_7-4_fc4 fc4
nhorman rpms/iozone/devel iozone-3-1_fc4 devel
nhorman rpms/iozone/FC-3 iozone-3-1_fc3 fc3
+kevin rpms/exo/devel exo-0_3_0-6_fc5 devel
17 years, 9 months